diff --git a/src/scene-entry-manager.js b/src/scene-entry-manager.js
index 38aa4f55acd0a6786b875103b9fac03f9bf43fdb..999075799c2b97cbd92241f2352b676b86549f94 100644
--- a/src/scene-entry-manager.js
+++ b/src/scene-entry-manager.js
@@ -61,6 +61,8 @@ export default class SceneEntryManager {
       NAF.connection.adapter.setLocalMediaStream(mediaStream);
     }
 
+    this.spawnAvatar();
+
     if (isBotMode) {
       this.runBot(mediaStream);
       return;
@@ -71,8 +73,6 @@ export default class SceneEntryManager {
     this.hubChannel.sendEntryEvent().then(() => {
       this.store.update({ activity: { lastEnteredAt: new Date().toISOString() } });
     });
-
-    this.spawnAvatar();
   };
 
   enterSceneWhenLoaded = (mediaStream, enterInVR) => {