diff --git a/client/src/components/Form/Select/Select.jsx b/client/src/components/Form/Select/Select.jsx
index dfbf02dfc..f375ba858 100644
--- a/client/src/components/Form/Select/Select.jsx
+++ b/client/src/components/Form/Select/Select.jsx
@@ -2,17 +2,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 const Select = ({ name, label, items, error, wrapperClass, selectClass, blankItem, ...rest }) => {
-  let wrapperClassRender = 'form-group';
-  let selectClassRender = 'col-xs-10';
-  if (wrapperClass) {
-    wrapperClassRender = wrapperClass;
-  }
-  if (selectClass) {
-    selectClassRender = selectClass;
-  }
-
   return (
-    <div className={`${wrapperClassRender}`}>
+    <div className={`${wrapperClass || 'form-group'}`}>
       {label !== '' ? (
         <label htmlFor={name} className="col-sm-2 col-form-label">
           {label}
@@ -20,7 +11,7 @@ const Select = ({ name, label, items, error, wrapperClass, selectClass, blankIte
       ) : (
         <div />
       )}
-      <div className={`${selectClassRender}`}>
+      <div className={`${selectClass || 'col-xs-10'}`}>
         <select className={'form-control'} id={name} name={name} {...rest}>
           {blankItem && (
             <option key="" value="">