diff --git a/source/guide/app-pre-processors-and-webpack.md b/source/guide/app-pre-processors-and-webpack.md
index b778c5c8..3af0ed13 100644
--- a/source/guide/app-pre-processors-and-webpack.md
+++ b/source/guide/app-pre-processors-and-webpack.md
@@ -94,6 +94,14 @@ build: {
 
 And you're done.
 
+### Web worker Support Hotfix (https://github.com/webpack/webpack/issues/6642):
+```
+  // quasar.conf
+  extendWebpack (cfg) {
+    cfg.output.globalObject = 'this'
+  }
+```
+
 ## SASS/SCSS support
 So you want to be able to write SASS/SCSS CSS code. You need a loader for it. We first install it. Note that for this particular case you also need to install node-sass because sass-loader depends on it as a peer dependency.
 
diff --git a/source/guide/app-quasar.conf.js.md b/source/guide/app-quasar.conf.js.md
index 75d7428f..4f912b4b 100644
--- a/source/guide/app-quasar.conf.js.md
+++ b/source/guide/app-quasar.conf.js.md
@@ -245,7 +245,6 @@ build: {
   }
 }
 ```
-
 Equivalent with chainWebpack():
 ```js
 // quasar.conf.js
@@ -255,4 +254,15 @@ build: {
       .set('myalias', path.resolve(__dirname, './src/somefolder'))
   }
 }
-```
+
+#### Fixing Global Object availability for Web Workers
+
+```js
+// quasar.conf.js
+
+build: {
+  extendWebpack (cfg) {
+   cfg.output.globalObject = 'this'
+  }
+}
+``````
diff --git a/source/guide/quasar-upgrade-guide.md b/source/guide/quasar-upgrade-guide.md
index 86da0ddd..884e918e 100644
--- a/source/guide/quasar-upgrade-guide.md
+++ b/source/guide/quasar-upgrade-guide.md
@@ -66,6 +66,8 @@ $ yarn                               # or: npm install
 * QIcon: removed "mat" & "ios" props for performance reasons (use `:name="$q.theme === 'mat' ? val : otherVal"` instead)
 * Removed utils > dom > viewport() method (use window.innerHeight/innerWidth instead)
 * Updated Quasar ionicons set to Ionicons v4 -- compatible with quasar-extras@2.0
+* [Web Workers break Upstream Hot Module Reload HMR] (https://github.com/webpack/webpack/issues/6642)
+* [Web Workers require update to webpack.cfg] (/guide/app-quasar.conf.js.html) for quasar.conf.js
 
 ## Upgrading pre v0.15 to Quasar v0.15+
 There's been A LOT of work done for v0.15. The Quasar CLI has been rewritten from scratch to allow for a stellar development experience (Mobile App developers and Electron will fall in love with it!). Only one starter kit is required in order to handle websites, PWAs, Mobile Apps and Electron Apps. Building any of those is a matter of just adding a parameter to the dev/build command.