diff --git a/frontend/apps/editor3d/app/src/pages/PageEnigma/Editor/editor.ts b/frontend/apps/editor3d/app/src/pages/PageEnigma/Editor/editor.ts
index a35393ff05..630d2a27f7 100644
--- a/frontend/apps/editor3d/app/src/pages/PageEnigma/Editor/editor.ts
+++ b/frontend/apps/editor3d/app/src/pages/PageEnigma/Editor/editor.ts
@@ -1300,17 +1300,6 @@ class Editor {
       }
     }
 
-    if (this.cam_obj == undefined) {
-      this.cam_obj = this.activeScene.get_object_by_name(this.camera_name);
-
-      if (this.outliner_feature_flag) {
-        const result = this.sceneManager?.render_outliner(
-          this.timeline.characters,
-        );
-        if (result) outlinerState.items.value = result.items;
-      }
-    }
-
     if (this.clock == undefined || this.renderer == undefined) {
       return;
     }
diff --git a/frontend/apps/editor3d/app/src/pages/PageEnigma/Editor/free_cam.ts b/frontend/apps/editor3d/app/src/pages/PageEnigma/Editor/free_cam.ts
index 1f2674dcd7..5878047c2c 100644
--- a/frontend/apps/editor3d/app/src/pages/PageEnigma/Editor/free_cam.ts
+++ b/frontend/apps/editor3d/app/src/pages/PageEnigma/Editor/free_cam.ts
@@ -220,8 +220,12 @@ class FreeCam extends EventDispatcher {
     this.updateMovementVector();
   }
 
+  isStationary() {
+    return this.moveVector.distanceTo(new Vector3(0, 0, 0)) === 0;
+  }
+
   update(delta: number) {
-    if (!this.enabled) {
+    if (!this.enabled || this.isStationary()) {
       return;
     }