diff --git a/src/index.js b/src/index.js
index fa64e8923edfb8f103f8ac0d98342e759ad59304..5c9f008ccd2e110ba4753133005ff42c4e8884c7 100644
--- a/src/index.js
+++ b/src/index.js
@@ -13,7 +13,7 @@ const sceneId = qs.get("scene_id") || (pathname.startsWith("/scenes/") && pathna
 const root = (
   <HomeRoot
     initialEnvironment={qs.get("initial_environment")}
-    sceneId={sceneId}
+    sceneId={sceneId || ""}
     authVerify={qs.has("auth_topic")}
     authTopic={qs.get("auth_topic")}
     authToken={qs.get("auth_token")}
diff --git a/src/scene-entry-manager.js b/src/scene-entry-manager.js
index a2f67316e2536fc0bbb628725f73443417ccc005..b82fd1deef23bfae83faf4f77f8653a9a37f0d5e 100644
--- a/src/scene-entry-manager.js
+++ b/src/scene-entry-manager.js
@@ -57,6 +57,10 @@ export default class SceneEntryManager {
 
     if (qsTruthy("offline")) return;
 
+    if (mediaStream) {
+      NAF.connection.adapter.setLocalMediaStream(mediaStream);
+    }
+
     if (isBotMode) {
       this.runBot(mediaStream);
       return;
@@ -68,10 +72,6 @@ export default class SceneEntryManager {
       this.store.update({ activity: { lastEnteredAt: new Date().toISOString() } });
     });
 
-    if (mediaStream) {
-      NAF.connection.adapter.setLocalMediaStream(mediaStream);
-    }
-
     this.spawnAvatar();
   };