diff --git a/src/auth/useRegisterPasswordlessUser.ts b/src/auth/useRegisterPasswordlessUser.ts
index bb757da9..44f2132f 100644
--- a/src/auth/useRegisterPasswordlessUser.ts
+++ b/src/auth/useRegisterPasswordlessUser.ts
@@ -41,7 +41,9 @@ export function useRegisterPasswordlessUser(): UseRegisterPasswordlessUserType {
         throw new Error("No client context");
       }
       if (widget) {
-        throw new Error("We never register passwordless user in widget");
+        throw new Error(
+          "Registration was skipped: We should never try to register password-less user in embedded mode.",
+        );
       }
 
       try {
diff --git a/src/room/RoomPage.tsx b/src/room/RoomPage.tsx
index 3ae11b50..0e93b547 100644
--- a/src/room/RoomPage.tsx
+++ b/src/room/RoomPage.tsx
@@ -29,6 +29,7 @@ import { useOptInAnalytics } from "../settings/useSetting";
 import { HomePage } from "../home/HomePage";
 import { platform } from "../Platform";
 import { AppSelectionModal } from "./AppSelectionModal";
+import { widget } from "../widget";
 
 export const RoomPage: FC = () => {
   const {
@@ -62,7 +63,7 @@ export const RoomPage: FC = () => {
   useEffect(() => {
     // If we've finished loading, are not already authed and we've been given a display name as
     // a URL param, automatically register a passwordless user
-    if (!loading && !authenticated && displayName) {
+    if (!loading && !authenticated && displayName && !widget) {
       setIsRegistering(true);
       registerPasswordlessUser(displayName).finally(() => {
         setIsRegistering(false);