diff --git a/src/services/webService.ts b/src/services/webService.ts
index 2f5f3e3f..8beda45c 100644
--- a/src/services/webService.ts
+++ b/src/services/webService.ts
@@ -97,7 +97,7 @@ export const stopWebServer = async (): Promise<void> => {
 };
 
 interface IWsCustomData extends ws {
-    accountId: string;
+    accountId?: string;
 }
 
 interface IWsMsgFromClient {
@@ -106,6 +106,7 @@ interface IWsMsgFromClient {
         password: string;
         isRegister: boolean;
     };
+    logout?: boolean;
 }
 
 interface IWsMsgToClient {
@@ -173,6 +174,9 @@ const wsOnConnect = (ws: ws, _req: http.IncomingMessage): void => {
                 );
             }
         }
+        if (data.logout) {
+            (ws as IWsCustomData).accountId = undefined;
+        }
     });
 };
 
diff --git a/static/webui/index.html b/static/webui/index.html
index 5b92f727..1a748968 100644
--- a/static/webui/index.html
+++ b/static/webui/index.html
@@ -37,7 +37,7 @@
                 <li class="nav-item dropdown user-dropdown">
                     <button class="nav-link dropdown-toggle displayname" data-bs-toggle="dropdown" aria-expanded="false"></button>
                     <ul class="dropdown-menu dropdown-menu-end">
-                        <li><a class="dropdown-item" href="/webui/" onclick="logout();" data-loc="navbar_logout"></a></li>
+                        <li><a class="dropdown-item" href="/webui/" onclick="doLogout();" data-loc="navbar_logout"></a></li>
                         <li><hr class="dropdown-divider"></li>
                         <li><a class="dropdown-item" href="#" onclick="event.preventDefault();renameAccount();" data-loc="navbar_renameAccount"></a></li>
                         <li><a class="dropdown-item" href="#" onclick="event.preventDefault();deleteAccount();" data-loc="navbar_deleteAccount"></a></li>
diff --git a/static/webui/script.js b/static/webui/script.js
index 74d399b5..d61a7cb5 100644
--- a/static/webui/script.js
+++ b/static/webui/script.js
@@ -11,24 +11,24 @@
 let auth_pending = false,
     did_initial_auth = false;
 const sendAuth = isRegister => {
-    auth_pending = true;
-    window.ws.send(
-        JSON.stringify({
-            auth: {
-                email: localStorage.getItem("email"),
-                password: wp.encSync(localStorage.getItem("password")),
-                isRegister
-            }
-        })
-    );
+    if (localStorage.getItem("email") && localStorage.getItem("password")) {
+        auth_pending = true;
+        window.ws.send(
+            JSON.stringify({
+                auth: {
+                    email: localStorage.getItem("email"),
+                    password: wp.encSync(localStorage.getItem("password")),
+                    isRegister
+                }
+            })
+        );
+    }
 };
 
 function openWebSocket() {
     window.ws = new WebSocket("/custom/ws");
     window.ws.onopen = () => {
-        if (localStorage.getItem("email") && localStorage.getItem("password")) {
-            sendAuth(false);
-        }
+        sendAuth(false);
     };
     window.ws.onmessage = e => {
         const msg = JSON.parse(e.data);
@@ -115,6 +115,14 @@ function logout() {
     did_initial_auth = false;
 }
 
+function doLogout() {
+    logout();
+    if (window.ws) {
+        // Unsubscribe from notifications about nonce invalidation
+        window.ws.send(JSON.stringify({ logout: true }));
+    }
+}
+
 function renameAccount() {
     const newname = window.prompt(loc("code_changeNameConfirm"));
     if (newname) {