diff --git a/client/src/main.ts b/client/src/main.ts
index 0fddf3aac..99976a3f7 100644
--- a/client/src/main.ts
+++ b/client/src/main.ts
@@ -11,20 +11,9 @@ 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 (navigator.serviceWorker && typeof navigator.serviceWorker.getRegistrations === 'function') {
-      navigator.serviceWorker.getRegistrations()
-               .then(registrations => {
-                 for (const registration of registrations) {
-                   registration.unregister()
-                 }
-               })
+    if ('serviceWorker' in navigator && environment.production) {
+      navigator.serviceWorker.register('/ngsw-worker.js')
+        .catch(err => console.error('Cannot register service worker.', err))
     }
 
     if (!environment.production) {
diff --git a/client/src/ngsw-config.json b/client/src/ngsw-config.json
index b5d11e59a..d68db79d0 100644
--- a/client/src/ngsw-config.json
+++ b/client/src/ngsw-config.json
@@ -7,10 +7,9 @@
       "resources": {
         "files": [
           "/index.html",
-          "/client/assets/images/favicon.png",
-          "/client/*.bundle.css",
-          "/client/*.bundle.js",
-          "/client/*.chunk.js",
+          "/client/assets/images/icons/favicon.png",
+          "/client/*.css",
+          "/client/*.js",
           "/manifest.webmanifest"
         ]
       }
diff --git a/scripts/build/client.sh b/scripts/build/client.sh
index 0f5b2d976..68939290c 100755
--- a/scripts/build/client.sh
+++ b/scripts/build/client.sh
@@ -70,6 +70,8 @@ else
     npm run ng build -- --localize=false --output-path "dist/$defaultLanguage/" --deploy-url "/client/$defaultLanguage/" --prod --stats-json $additionalParams
 fi
 
+mv "./dist/$defaultLanguage/ngsw-worker.js" "./dist/"
+
 cd ../ && npm run build:embed && cd client/
 
 # Copy runtime locales