diff --git a/src/components/EditorWidgets/Markdown/MarkdownControl/VisualEditor/index.js b/src/components/EditorWidgets/Markdown/MarkdownControl/VisualEditor/index.js
index ff475f78790e..6f4451820a27 100644
--- a/src/components/EditorWidgets/Markdown/MarkdownControl/VisualEditor/index.js
+++ b/src/components/EditorWidgets/Markdown/MarkdownControl/VisualEditor/index.js
@@ -44,17 +44,7 @@ export default class Editor extends Component {
   }
 
   shouldComponentUpdate(nextProps, nextState) {
-    return (this.props.value !== null && nextProps.value === null)
-      || (this.props.value === null && nextProps.value !== null)
-      || !this.state.value.equals(nextState.value);
-  }
-
-  componentWillUpdate(nextProps) {
-    const shouldResetState = (this.props.value !== null && nextProps.value === null)
-      || (this.props.value === null && nextProps.value !== null)
-    if (shouldResetState) {
-      this.setState({ value: createSlateValue(nextProps.value) });
-    }
+    return !this.state.value.equals(nextState.value);
   }
 
   handlePaste = (e, data, change) => {