diff --git a/src/room/LobbyView.tsx b/src/room/LobbyView.tsx
index 53bc170b..5880c362 100644
--- a/src/room/LobbyView.tsx
+++ b/src/room/LobbyView.tsx
@@ -79,6 +79,17 @@ export const LobbyView: FC<Props> = ({
     [setE2EESharedKey]
   );
 
+  useEffect(() => {
+    const originalHash = location.hash;
+    let hash = originalHash === "" ? "#" : originalHash;
+    hash = hash.split("?password=")[0];
+    hash += `?password=${e2eeSharedKey ?? ""}`;
+
+    if (originalHash !== hash) {
+      location.replace(hash);
+    }
+  }, [e2eeSharedKey]);
+
   return (
     <div className={styles.room}>
       {!hideHeader && (