diff --git a/src/ckeditor.js b/src/ckeditor.js
index e703048..633d464 100644
--- a/src/ckeditor.js
+++ b/src/ckeditor.js
@@ -33,7 +33,7 @@ class CKEditor extends React.Component {
 
   componentWillReceiveProps(props) {
     const editor = this.editorInstance;
-    if (editor && editor.getData() !== props.content) {
+    if (props.content !== undefined && editor && editor.getData() !== props.content) {
       editor.setData(props.content);
     }
   }