diff --git a/next.config.js b/next.config.js
index 08e7471fc..a7e6fb4c9 100644
--- a/next.config.js
+++ b/next.config.js
@@ -1,8 +1,10 @@
+
+const nextSourceMaps = require('@zeit/next-source-maps');
 const bundleAnalyzer = require('@next/bundle-analyzer')({
   enabled: !!process.env.BUNDLE_ANALYZE
 })
 
-module.exports = module.exports = bundleAnalyzer({
+module.exports = nextSourceMaps(bundleAnalyzer({
   images: {
     domains: ['cdn11.bigcommerce.com'],
   },
@@ -54,4 +56,4 @@ module.exports = module.exports = bundleAnalyzer({
       },
     ]
   },
-});
+}));
diff --git a/package.json b/package.json
index 1f86de21d..71aea3bf9 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
     "@tailwindcss/ui": "^0.6.2",
     "@types/lodash.throttle": "^4.1.6",
     "@vercel/fetch": "^6.1.0",
+    "@zeit/next-source-maps": "^0.0.3",
     "bowser": "^2.11.0",
     "classnames": "^2.2.6",
     "email-validator": "^2.0.4",
diff --git a/yarn.lock b/yarn.lock
index 9506c5508..fe3d64fa7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2090,6 +2090,11 @@
     async-retry "1.2.3"
     lru-cache "5.1.1"
 
+"@zeit/next-source-maps@^0.0.3":
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/@zeit/next-source-maps/-/next-source-maps-0.0.3.tgz#d62e93b4f5ccdd542c8530d21f60dd2757d98e3c"
+  integrity sha512-gFDf7yQI8r/fdzTKJG9cp0rhKscRJWs/uebhScj8nZINT16kPTVm23JAi5EivO5pAJmHGzT1A8dwxAhTX0liNw==
+
 abort-controller@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"