diff --git a/src/excalidraw-app/collab/CollabWrapper.tsx b/src/excalidraw-app/collab/CollabWrapper.tsx
index 0cd809909..e19ccfb9c 100644
--- a/src/excalidraw-app/collab/CollabWrapper.tsx
+++ b/src/excalidraw-app/collab/CollabWrapper.tsx
@@ -110,10 +110,6 @@ class CollabWrapper extends PureComponent<Props, CollabState> {
     window.addEventListener(EVENT.BEFORE_UNLOAD, this.beforeUnload);
     window.addEventListener(EVENT.UNLOAD, this.onUnload);
 
-    if (!this.state.username) {
-      this.updateUsername(getRandomUsername());
-    }
-
     if (
       process.env.NODE_ENV === ENV.TEST ||
       process.env.NODE_ENV === ENV.DEVELOPMENT
@@ -228,6 +224,10 @@ class CollabWrapper extends PureComponent<Props, CollabState> {
       return null;
     }
 
+    if (!this.state.username) {
+      this.updateUsername(getRandomUsername());
+    }
+
     let roomId;
     let roomKey;