diff --git a/embark-ui/src/containers/FiddleContainer.js b/embark-ui/src/containers/FiddleContainer.js
index 0354f9f68..8d29a80a0 100644
--- a/embark-ui/src/containers/FiddleContainer.js
+++ b/embark-ui/src/containers/FiddleContainer.js
@@ -29,7 +29,7 @@ class FiddleContainer extends Component {
     
   }
   componentDidUpdate(prevProps){
-    if(prevProps.lastFiddle !== this.props.lastFiddle){
+    if(this.props.lastFiddle && (prevProps.lastFiddle !== this.props.lastFiddle)){
       this._onCodeChange(this.props.lastFiddle);
     }
   }