1 files changed, 11 insertions, 4 deletions

diff --git a/client/src/main.ts b/client/src/main.ts
index 9686ba4b8..4b18d163c 100644
--- a/client/src/main.ts
+++ b/client/src/main.ts
@@ -13,11 +13,18 @@ if (environment.production) {
 const bootstrap = () => platformBrowserDynamic()
   .bootstrapModule(AppModule)
   .then(bootstrapModule => {
+    // TODO: Uncomment and remove unregistration when https://github.com/angular/angular/issues/21191 is fixed
     // TODO: Remove when https://github.com/angular/angular-cli/issues/8779 is fixed?
-    if ('serviceWorker' in navigator && environment.production) {
-      navigator.serviceWorker.register('/ngsw-worker.js')
-        .catch(err => console.error('Cannot register service worker.', err))
-    }
+    // if ('serviceWorker' in navigator && environment.production) {
+    //   navigator.serviceWorker.register('/ngsw-worker.js')
+    //     .catch(err => console.error('Cannot register service worker.', err))
+    // }
+
+    navigator.serviceWorker.getRegistrations().then(registrations => {
+      for (const registration of registrations) {
+        registration.unregister()
+      }
+    })
 
     return bootstrapModule
   })