1 files changed, 8 insertions, 0 deletions
diff --git a/web/app.js b/web/app.js
index 9a5a460..77a5d19 100644
--- a/web/app.js
+++ b/web/app.js
@@ -2646,6 +2646,14 @@ async function enableNotifications(btn) {
     await registerServiceWorker();
     const registration = await navigator.serviceWorker.ready;
 
+    // Unsubscribe any stale subscription (e.g. from a VAPID key rotation).
+    // PushManager.subscribe() throws "applicationServerKey is not valid" if the
+    // existing subscription was created with a different key.
+    const existingSub = await registration.pushManager.getSubscription();
+    if (existingSub) {
+      await existingSub.unsubscribe();
+    }
+
     // Subscribe via PushManager.
     const subscription = await registration.pushManager.subscribe({
       userVisibleOnly: true,