diff --git a/src/canvas/index.js b/src/canvas/index.js
index 241e80be6..4ed8d1aec 100644
--- a/src/canvas/index.js
+++ b/src/canvas/index.js
@@ -678,8 +678,8 @@ export default () => {
     destroy() {
       canvas.stopListening();
       CanvasView.remove();
-      [canvas, CanvasView].forEach(i => (i = null));
-      c = {};
+      [c, canvas, CanvasView].forEach(i => (i = {}));
+      this.em = {};
     }
   };
 };
diff --git a/src/dom_components/index.js b/src/dom_components/index.js
index f3466e258..5963f1841 100644
--- a/src/dom_components/index.js
+++ b/src/dom_components/index.js
@@ -740,6 +740,7 @@ export default () => {
       this.clear();
       componentView.remove();
       [c, em, componentsById, component, componentView].forEach(i => (i = {}));
+      this.em = {};
     }
   };
 };
diff --git a/src/keymaps/index.js b/src/keymaps/index.js
index 7759e9e9d..465e55a34 100644
--- a/src/keymaps/index.js
+++ b/src/keymaps/index.js
@@ -218,6 +218,7 @@ export default () => {
     destroy() {
       this.removeAll();
       [em, config, keymaps].forEach(i => (i = {}));
+      this.em = {};
     }
   };
 };