diff --git a/src/scene/world.ts b/src/scene/world.ts
index a8e04a2..d5386d3 100644
--- a/src/scene/world.ts
+++ b/src/scene/world.ts
@@ -239,6 +239,7 @@ export function createWorld(canvas: HTMLCanvasElement, terrainData: Awaited<Retu
       }
       return true;
     });
+    closeCompanion();
     if (!spot) return;
     emotes.cancel(); refreshEmotes();
     controls.moveTo(spot.position, spot.yaw);