From 9249b4188da0b63cd801d0150a594e30bdf58cca Mon Sep 17 00:00:00 2001
From: Victor Giers <mail@victorgiers.com>
Date: Mon, 27 Apr 2026 16:07:46 +0200
Subject: [PATCH] auto-git:  [change] src/viewport-three/viewport-host.ts

---
 src/viewport-three/viewport-host.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/viewport-three/viewport-host.ts b/src/viewport-three/viewport-host.ts
index 416fb8ca..ee6429a2 100644
--- a/src/viewport-three/viewport-host.ts
+++ b/src/viewport-three/viewport-host.ts
@@ -1127,7 +1127,15 @@ export class ViewportHost {
       versionInfo?.frameVersion ?? this.currentSimulationFrameVersion + 1;
     this.applyWorld();
 
-    if (this.currentDocument === null || runtimeScene === null) {
+    if (runtimeScene === null) {
+      this.currentSimulationMembershipSignatures =
+        createViewportSimulationMembershipSignatures(null);
+      this.simulationActiveNpcEntityIds.clear();
+      this.simulationInteractableEnabledById.clear();
+      return;
+    }
+
+    if (this.currentDocument === null) {
       return;
     }
 
@@ -1159,6 +1167,7 @@ export class ViewportHost {
       this.currentSimulationMembershipSignatures.interactables
     ) {
       this.simulationInteractableEnabledById.clear();
+      this.cacheSimulationInteractableEnabledState(runtimeScene);
       this.rebuildEntityMarkers(this.currentDocument, this.currentSelection);
     } else {
       this.syncSimulationInteractables(runtimeScene);