diff --git a/packages/editor/src/components/Editor2Container.tsx b/packages/editor/src/components/Editor2Container.tsx
index 4494d5e984..cb2b8eafec 100644
--- a/packages/editor/src/components/Editor2Container.tsx
+++ b/packages/editor/src/components/Editor2Container.tsx
@@ -24,6 +24,7 @@ Ethereal Engine. All Rights Reserved.
 */
 
 import { PopoverState } from '@etherealengine/client-core/src/common/services/PopoverState'
+import { useRemoveEngineCanvas } from '@etherealengine/client-core/src/hooks/useRemoveEngineCanvas'
 import { assetPath } from '@etherealengine/common/src/schema.type.module'
 import { EntityUUID } from '@etherealengine/ecs'
 import { getMutableState, useHookstate, useMutableState } from '@etherealengine/hyperflux'
@@ -144,6 +145,8 @@ const EditorContainer = () => {
     }
   }, [errorState])
 
+  useRemoveEngineCanvas()
+
   return (
     <main className="pointer-events-auto">
       <div
diff --git a/packages/ui/src/components/editor/panels/Viewport/container/index.tsx b/packages/ui/src/components/editor/panels/Viewport/container/index.tsx
index 89bb80d05f..24db66349e 100644
--- a/packages/ui/src/components/editor/panels/Viewport/container/index.tsx
+++ b/packages/ui/src/components/editor/panels/Viewport/container/index.tsx
@@ -79,8 +79,6 @@ const ViewportDnD = () => {
     observer.observe(ref.current)
     return () => {
       observer.disconnect()
-      //   const canvas = document.getElementById('engine-renderer-canvas')!
-      //   parent.removeChild(canvas)
     }
   }, [ref])
 
@@ -93,7 +91,7 @@ const ViewportDnD = () => {
         isDragging && isOver ? 'border-4' : 'border-none',
         isDragging ? 'pointer-events-auto' : 'pointer-events-none'
       )}
-    ></div>
+    />
   )
 }