diff --git a/src/client/account.ts b/src/client/account.ts
index efe9f19527..50eb7ecba3 100644
--- a/src/client/account.ts
+++ b/src/client/account.ts
@@ -31,7 +31,7 @@ export async function signout() {
 	else await del('accounts');
 	//#endregion
 
-	//#region Remove push notification registration
+	//#region Remove service worker registration
 	try {
 		if (navigator.serviceWorker.controller) {
 			const registration = await navigator.serviceWorker.ready;
@@ -46,6 +46,13 @@ export async function signout() {
 				});
 			}
 		}
+
+		if (accounts.length === 0) {
+			await navigator.serviceWorker.getRegistrations()
+				.then(registrations => {
+					return Promise.all(registrations.map(registration => registration.unregister()));
+				})
+		}
 	} catch (e) {}
 	//#endregion