diff --git a/app/assets/javascripts/service-worker.js.erb b/app/assets/javascripts/service-worker.js.erb
index 9efd286b7cd..e5f53f34b41 100644
--- a/app/assets/javascripts/service-worker.js.erb
+++ b/app/assets/javascripts/service-worker.js.erb
@@ -186,7 +186,35 @@ self.addEventListener('notificationclick', function(event) {
 self.addEventListener('message', function(event) {
   if('lastAction' in event.data){
     lastAction = event.data.lastAction;
-  }});
+  }
+});
+
+self.addEventListener('pushsubscriptionchange', function(event) {
+  event.waitUntil(
+    Promise.all(
+      fetch('<%= Discourse.base_url %>/push_notifications/subscribe', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' },
+        body: new URLSearchParams({
+          "subscription[endpoint]": event.newSubscription.endpoint,
+          "subscription[keys][auth]": event.newSubscription.toJSON().keys.auth,
+          "subscription[keys][p256dh]": event.newSubscription.toJSON().keys.p256dh,
+          "send_confirmation": false
+        })
+      }),
+      fetch('<%= Discourse.base_url %>/push_notifications/unsubscribe', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' },
+        body: new URLSearchParams({
+          "subscription[endpoint]": event.oldSubscription.endpoint,
+          "subscription[keys][auth]": event.oldSubscription.toJSON().keys.auth,
+          "subscription[keys][p256dh]": event.oldSubscription.toJSON().keys.p256dh
+        })
+      })
+    )
+  );
+});
+
 <% DiscoursePluginRegistry.service_workers.each do |js| %>
 <%=raw "#{File.read(js)}" %>
 <% end %>