diff --git a/client/src/app/videos/+video-edit/video-add.component.ts b/client/src/app/videos/+video-edit/video-add.component.ts
index 324f26983..4c9dbf1bb 100644
--- a/client/src/app/videos/+video-edit/video-add.component.ts
+++ b/client/src/app/videos/+video-edit/video-add.component.ts
@@ -164,7 +164,7 @@ export class VideoAddComponent extends FormReactive implements OnInit, OnDestroy
 
     const formData = new FormData()
     formData.append('name', name)
-    // Put the video "private" -> we wait he validates the second step
+    // Put the video "private" -> we are waiting the user validation of the second step
     formData.append('privacy', VideoPrivacy.PRIVATE.toString())
     formData.append('nsfw', '' + nsfw)
     formData.append('commentsEnabled', '' + commentsEnabled)
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
   })
diff --git a/client/src/polyfills.ts b/client/src/polyfills.ts
index fe44c5e22..12b317101 100644
--- a/client/src/polyfills.ts
+++ b/client/src/polyfills.ts
@@ -61,7 +61,7 @@ import 'core-js/es7/reflect'
  * user can disable parts of macroTask/DomEvents patch by setting following flags
  */
 
-(window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
+// (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
 // (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
 // (window as any).__zone_symbol__BLACK_LISTED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
 /*