diff --git a/lib/TextField.js b/lib/TextField.js
old mode 100644
new mode 100755
index d42523a..12af455
--- a/lib/TextField.js
+++ b/lib/TextField.js
@@ -10,7 +10,7 @@ export default class TextField extends Component {
     super(props, context);
     this.state = {
       isFocused: false,
-      text: props.value,
+      text: this.props.value ? this.props.value : '',
       height: props.height
     };
   }
@@ -27,7 +27,7 @@ export default class TextField extends Component {
     this.refs.wrapper.measureLayout(...args)
   }
   componentWillReceiveProps(nextProps: Object){
-    if(this.props.text !== nextProps.value){
+    if(nextProps.hasOwnProperty('value') && this.state.text !== nextProps.value){
       nextProps.value.length !== 0 ?
         this.refs.floatingLabel.floatLabel()
         : this.refs.floatingLabel.sinkLabel();
@@ -149,7 +149,6 @@ TextField.defaultProps = {
   labelColor: '#9E9E9E',
   borderColor: '#E0E0E0',
   textColor: '#000',
-  value: '',
   dense: false,
   underlineColorAndroid: 'rgba(0,0,0,0)',
   multiline: false,