diff --git a/gulp/tasks/gen-service-worker.js b/gulp/tasks/gen-service-worker.js
index 362f7b83fe..9e3eaa9ca7 100755
--- a/gulp/tasks/gen-service-worker.js
+++ b/gulp/tasks/gen-service-worker.js
@@ -75,9 +75,7 @@ function generateServiceWorker(es6) {
     });
 
     const options = {
-      navigateFallback: '/',
-      navigateFallbackWhitelist:
-          [/^(?:(?!(?:static|api|frontend_latest|frontend_es5|local|service_worker.js|manifest.json)).)*$/],
+      directoryIndex: '',
       dynamicUrlToDependencies: dynamicUrlToDependencies,
       staticFileGlobs: [
         baseRootDir + '/icons/favicon.ico',
@@ -100,7 +98,7 @@ function generateServiceWorker(es6) {
           handler: 'networkOnly',
         },
         { // Get manifest and service worker from network.
-          urlPattern: '/(service_worker.js|manifest.json)',
+          urlPattern: '/(service_worker.js|service_worker_es5.js|manifest.json)',
           handler: 'networkOnly',
         },
         { // For rest of the files (on Home Assistant domain only) try both cache and network.