diff --git a/src/ReactCodeInput.js b/src/ReactCodeInput.js
index a88fd5a..6fe5fa9 100644
--- a/src/ReactCodeInput.js
+++ b/src/ReactCodeInput.js
@@ -48,7 +48,8 @@ class ReactCodeInput extends Component {
     }
 
     this.setState({
-      value: nextProps.value,
+      input: getInputArrayFromProps(nextProps),
+      value: getValueFromProps(nextProps),
     });
   }