diff --git a/src/components/select-display.js b/src/components/select-display.js
index cc6c2e3..a6a85a3 100644
--- a/src/components/select-display.js
+++ b/src/components/select-display.js
@@ -1,42 +1,58 @@
-import React from 'react';
+import React, {Component} from 'react';
 import reactReduxStoreShape from 'react-redux/lib/utils/storeShape';
 import find from 'lodash/find';
-import get from 'lodash/get'
+import isEqual from 'lodash/isEqual';
+import compose from 'lodash/flowRight';
+import {connect as connectToState} from 'react-redux';
 import i18n from 'i18next';
+import get from 'lodash/get';
+import isUndefined from 'lodash/isUndefined';
+import {selectReferenceList} from '../store/create-store';
+
 function renderLabelOfCode(values, code){
-  const element = values ? values.find(element => element.code === code) : [];
-  const label = element ? element.label : "";
-  return label;
+    const element = values ? values.find(element => element.code === code) : [];
+    const label = element ? element.label : "";
+    return label;
 }
 
+class DisplaySelectComponent extends Component {
+    componentWillReceiveProps(newProps){
+        const selectValues = newProps.referenceList[0] ?  newProps.referenceList[0].value || [] : [];
+        const defaultValueSelect = this.props.defaultValue ?  this.props.defaultValue  : get(selectValues.find(element => element.isDefaultValue), 'code');
+        if(!isEqual(this.props.referenceList, newProps.referenceList) && isUndefined(this.props.rawInputValue) && defaultValueSelect){
+            this.props.onChange(defaultValueSelect)
+        }
+    }
+    render(){
+        const {
+            name,
+            rawInputValue,
+            formattedInputValue,
+            onChange,
+            error,
+            defaultValue,
+            valid,
+            values,
+            referenceList =[{}],
+            masterDatum,
+            SelectComponent,
+            ...otherProps
+        } = this.props;
 
-const SelectComponent = ({
-    name,
-    rawInputValue,
-    formattedInputValue,
-    onChange,
-    error,
-    defaultValue,
-    valid,
-    masterDatum,
-    ...otherProps
-}, {store: {getState}}) => {
-    const {masterData = []} = getState();
-    const masterDatumObject = find(masterData, {name: masterDatum}) || {value: []};
-
-    const {value: values} = masterDatumObject;
-    const defaultValueSelect = values ? (defaultValue ? defaultValue : get(values.find(element => element.isDefaultValue), 'code')) : rawInputValue;
+        const selectValues = referenceList[0]? referenceList[0].value || [] : [];
+        const defaultValueSelect = defaultValue ?  defaultValue : get(selectValues.find(element => element.isDefaultValue), 'code');
 
-    const label = renderLabelOfCode(values, rawInputValue || defaultValueSelect);
-    return (
-        <div>
-          {i18n.t(label)}
-        </div>
-    );
-};
-
-SelectComponent.contextTypes = {
-    store: reactReduxStoreShape
-};
+        const currentValue = isUndefined(rawInputValue) ? defaultValueSelect: rawInputValue;
+        const finalValues = selectValues ? selectValues : values;
+        const label = renderLabelOfCode(finalValues, rawInputValue || currentValue);
+        return (
+            <div>
+            {i18n.t(label)}
+            </div>
+        );
+    }
+}
 
-export default SelectComponent;
+export default compose(
+    connectToState(selectReferenceList())
+)(DisplaySelectComponent)