diff --git a/src/scripts/settings/webSettings.js b/src/scripts/settings/webSettings.js
index 8d1e03854..2eb1bcbd4 100644
--- a/src/scripts/settings/webSettings.js
+++ b/src/scripts/settings/webSettings.js
@@ -73,7 +73,7 @@ export function getIncludeCorsCredentials() {
 export function getMultiServer() {
     return getConfig().then(config => {
         // Enable multi-server support when served by webpack
-        if (process.env.WEBPACK_SERVE) { // eslint-disable-line no-undef
+        if (__WEBPACK_SERVE__) { // eslint-disable-line no-undef
             return true;
         }
         return !!config.multiserver;
diff --git a/src/serviceworker.js b/src/serviceworker.js
index 1f38e2e5a..ca4ea5efe 100644
--- a/src/serviceworker.js
+++ b/src/serviceworker.js
@@ -44,9 +44,8 @@ self.addEventListener('notificationclick', function (event) {
     event.waitUntil(executeAction(action, data, serverId));
 }, false);
 
-// Do not precache files in development so live reload works as expected
-/* eslint-disable-next-line no-undef -- WEBPACK_SERVE is replaced by webpack */
-if (process.env.WEBPACK_SERVE) {
+// Do not precache files when running with webpack dev server so live reload works as expected
+if (!__WEBPACK_SERVE__) { // eslint-disable-line no-undef
     // this is needed by the webpack Workbox plugin
     /* eslint-disable-next-line no-restricted-globals,no-undef */
     precacheAndRoute(self.__WB_MANIFEST);
diff --git a/webpack.dev.js b/webpack.dev.js
index b66c8ddf0..4dc76aee3 100644
--- a/webpack.dev.js
+++ b/webpack.dev.js
@@ -26,7 +26,7 @@ module.exports = merge(common, {
     },
     plugins: [
         new DefinePlugin({
-            'process.env.WEBPACK_SERVE': true
+            __WEBPACK_SERVE__: true
         })
     ],
     devServer: {