diff --git a/package.json b/package.json
index fbd9e61d71..8e4bf8b4d3 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "version": "3.5.0-beta.1",
   "main": "src/main",
   "scripts": {
-    "dev": "electron-webpack dev",
+    "dev": "DEBUG=true electron-webpack dev",
     "compile": "yarn download-bins && yarn i18n:compile  && electron-webpack compile",
     "compile:main": "electron-webpack main",
     "compile:renderer": "electron-webpack renderer",
@@ -35,7 +35,7 @@
     "node": ">=12.0 <13.0"
   },
   "electronWebpack": {
-    "commonSourceDirectory": "./common",
+    "commonSourceDirectory": "./src/common",
     "staticSourceDirectory": "./static",
     "main": {
       "sourceDirectory": "./src/main"
diff --git a/src/main/router.ts b/src/main/router.ts
index 4c0b362540..758f94bd73 100644
--- a/src/main/router.ts
+++ b/src/main/router.ts
@@ -15,8 +15,6 @@ const Call = require('@hapi/call');
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const Subtext = require('@hapi/subtext');
 
-const assetsPath = path.join(__static, "build/client")
-
 const mimeTypes: {[key: string]: string} = {
   "html": "text/html",
   "txt": "text/plain",
@@ -87,7 +85,7 @@ export class Router {
   }
 
   protected handleStaticFile(file: string, response: http.ServerResponse) {
-    const asset = path.join(assetsPath, file)
+    const asset = path.join(__static, file)
     readFile(asset, (err, data) => {
       if (err) {
         // default to index.html so that react routes work when page is refreshed