diff --git a/Dockerfile b/Dockerfile
index f1afd8f98b..02bfc440e8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ COPY . .
 
 RUN npm install yarn -g
 RUN yarn
-RUN NODE_ENV=production yarn build
+RUN NODE_ENV=production yarn build:www
 
 FROM ubuntu:18.04
 
diff --git a/package.json b/package.json
index dce5227a20..dc07021ced 100644
--- a/package.json
+++ b/package.json
@@ -21,9 +21,10 @@
   },
   "scripts": {
     "analyze": "yarn run build && cd packages/apps && yarn run source-map-explorer build/main.*.js",
-    "build": "yarn run build:code && yarn run build:i18n",
+    "build": "yarn run build:i18n && yarn run build:code",
     "build:code": "NODE_ENV=production polkadot-dev-build-ts",
     "build:i18n": "i18next-scanner --config i18next-scanner.config.js",
+    "build:www": "rm -rf packages/apps/build && mkdir -p packages/apps/build && yarn run build:i18n && cd packages/apps && NODE_ENV=production webpack --config webpack.config.js",
     "docs": "echo \"skipping docs\"",
     "clean": "polkadot-dev-clean-build",
     "clean:i18n": "rm -rf packages/apps/public/locales/en && mkdir -p packages/apps/public/locales/en",
diff --git a/packages/app-tech-comm/src/index.tsx b/packages/app-tech-comm/src/index.tsx
index 4dd4d1f263..7907541e3b 100644
--- a/packages/app-tech-comm/src/index.tsx
+++ b/packages/app-tech-comm/src/index.tsx
@@ -31,7 +31,7 @@ export default function TechCommApp ({ basePath, className }: Props): React.Reac
     },
     {
       name: 'proposals',
-      text: t('Proposals ({{count}})', { replace: { count: proposals?.length || 0 } })
+      text: t('Proposals ({{count}})', { replace: { count: (proposals && proposals.length) || 0 } })
     }
   ], [proposals, t]);