diff --git a/.gitignore b/.gitignore
index d14544c7210..9c4a15c9ccc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,6 +76,7 @@ coverage.all
 /node_modules
 /yarn.lock
 /public/js
+/public/serviceworker.js
 /public/css
 /public/fonts
 /public/fomantic
diff --git a/webpack.config.js b/webpack.config.js
index b1038c407d4..70a5029e631 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -47,7 +47,7 @@ module.exports = {
     filename: ({chunk}) => {
       // serviceworker can only manage assets below it's script's directory so
       // we have to put it in / instead of /js/
-      return chunk.id === 'serviceworker' ? '[name].js' : 'js/[name].js';
+      return chunk.name === 'serviceworker' ? '[name].js' : 'js/[name].js';
     },
     chunkFilename: 'js/[name].js',
   },