diff --git a/dist/TaggedInput.js b/dist/TaggedInput.js
index 7001e7d..9065a7e 100644
--- a/dist/TaggedInput.js
+++ b/dist/TaggedInput.js
@@ -68,7 +68,7 @@ module.exports = React.createClass({
   getInitialState: function () {
     return {
       tags: (this.props.tags || []).slice(0),
-      currentInput: null
+      currentInput: ''
     };
   },
 
diff --git a/src/TaggedInput.jsx b/src/TaggedInput.jsx
index b92d7ac..0602fe5 100644
--- a/src/TaggedInput.jsx
+++ b/src/TaggedInput.jsx
@@ -68,7 +68,7 @@ module.exports = React.createClass({
   getInitialState: function () {
     return {
       tags: (this.props.tags || []).slice(0),
-      currentInput: null
+      currentInput: ''
     };
   },