diff --git a/src/e2ee/sharedKeyManagement.ts b/src/e2ee/sharedKeyManagement.ts
index 1e06dffc..e8e75b55 100644
--- a/src/e2ee/sharedKeyManagement.ts
+++ b/src/e2ee/sharedKeyManagement.ts
@@ -43,8 +43,7 @@ const useKeyFromUrl = (): [string, string] | [undefined, undefined] => {
   const urlParams = useUrlParams();
 
   useEffect(() => {
-    if (!urlParams.password) return;
-    if (urlParams.password === "") return;
+    if (!urlParams.password || !urlParams.roomId) return;
     if (!urlParams.roomId) return;
 
     setLocalStorageItem(