diff --git a/lib/TextField.js b/lib/TextField.js
index d42523a..c7182fd 100644
--- 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: props.value || '',
       height: props.height
     };
   }
@@ -28,7 +28,7 @@ export default class TextField extends Component {
   }
   componentWillReceiveProps(nextProps: Object){
     if(this.props.text !== nextProps.value){
-      nextProps.value.length !== 0 ?
+      (nextProps.value && nextProps.value.length !== 0) ?
         this.refs.floatingLabel.floatLabel()
         : this.refs.floatingLabel.sinkLabel();
       this.setState({text: nextProps.value});