diff --git a/frontend/server.ts b/frontend/server.ts
index 98af79224..ac508bca2 100644
--- a/frontend/server.ts
+++ b/frontend/server.ts
@@ -13,8 +13,7 @@ import { AppServerModule } from './src/main.server';
 import { APP_BASE_HREF } from '@angular/common';
 import { existsSync } from 'fs';
 
-const template = fs.readFileSync(path.join(__dirname, '../../mempool/browser/en-US/', 'index.html')).toString();
-
+const template = fs.readFileSync(path.join(__dirname, '../browser/en-US/', 'index.html')).toString();
 const win = domino.createWindow(template);
 
 // @ts-ignore
@@ -48,8 +47,7 @@ global['localStorage'] = {
 // The Express app is exported so that it can be used by serverless Functions.
 export function app(): express.Express {
   const server = express();
-  const distFolder = join(process.cwd(), 'dist/mempool/browser/en-US');
-  const indexHtml = existsSync(join(distFolder, 'index.original.html')) ? 'index.original.html' : 'index';
+  const distFolder = join(__dirname, '../browser/en-US');
 
   // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
   server.engine('html', ngExpressEngine({
@@ -59,33 +57,106 @@ export function app(): express.Express {
   server.set('view engine', 'html');
   server.set('views', distFolder);
 
-  // Example Express Rest API endpoints
-  // server.get('/api/**', (req, res) => { });
-  // Serve static files from /browser
-  server.get('*.*', express.static(distFolder, {
-    maxAge: '1y'
-  }));
+  // map each locale to its folder
+  mapLocaleToFolder(server, '/ar', 'ar');
+  mapLocaleToFolder(server, '/cs', 'cs');
+  mapLocaleToFolder(server, '/de', 'de');
+  mapLocaleToFolder(server, '/en', 'en-US');
+  mapLocaleToFolder(server, '/es', 'es');
+  mapLocaleToFolder(server, '/fa', 'fa');
+  mapLocaleToFolder(server, '/fr', 'fr');
+  mapLocaleToFolder(server, '/ja', 'ja');
+  mapLocaleToFolder(server, '/ka', 'ka');
+  mapLocaleToFolder(server, '/ko', 'ko');
+  mapLocaleToFolder(server, '/nl', 'nl');
+  mapLocaleToFolder(server, '/nb', 'nb');
+  mapLocaleToFolder(server, '/pt', 'pt');
+  mapLocaleToFolder(server, '/sl', 'sl');
+  mapLocaleToFolder(server, '/sv', 'sv');
+  mapLocaleToFolder(server, '/tr', 'tr');
+  mapLocaleToFolder(server, '/uk', 'uk');
+  mapLocaleToFolder(server, '/fi', 'fi');
+  mapLocaleToFolder(server, '/vi', 'vi');
+  mapLocaleToFolder(server, '/zh', 'zh');
 
-  server.get('/api/v1/**', createProxyMiddleware({
-    // @ts-ignore
-    target: win.__env.NGINX_PROTOCOL + '://' + win.__env.NGINX_HOSTNAME + ':' + win.__env.NGINX_PORT,
-    changeOrigin: true,
-  }));
+  // map null locale to en-US
+  mapLocaleToFolder(server, '', 'en-US');
 
+  // proxy API to nginx
   server.get('/api/**', createProxyMiddleware({
     // @ts-ignore
     target: win.__env.NGINX_PROTOCOL + '://' + win.__env.NGINX_HOSTNAME + ':' + win.__env.NGINX_PORT,
     changeOrigin: true,
   }));
 
-  // All regular routes use the Universal engine
-  server.get('*', (req, res) => {
-    res.render(indexHtml, { req, providers: [{ provide: APP_BASE_HREF, useValue: req.baseUrl }] });
-  });
-
   return server;
 }
 
+function mapLocaleToFolder(server, urlPrefix, folderName) {
+  // only handle URLs that actually exist
+  server.get(urlPrefix, getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/tx/*', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/block/*', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/mempool-block/*', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/address/*', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/blocks', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/graphs', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/liquid', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/liquid/tx/*', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/liquid/block/*', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/liquid/mempool-block/*', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/liquid/address/*', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/liquid/asset/*', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/liquid/blocks', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/liquid/graphs', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/liquid/assets', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/liquid/api', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/liquid/tv', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/liquid/status', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/liquid/about', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/testnet', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/testnet/tx/*', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/testnet/block/*', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/testnet/mempool-block/*', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/testnet/address/*', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/testnet/blocks', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/testnet/graphs', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/testnet/api', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/testnet/tv', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/testnet/status', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/testnet/about', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/bisq', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/bisq/tx/*', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/bisq/blocks', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/bisq/block/*', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/bisq/address/*', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/bisq/stats', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/bisq/about', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/bisq/api', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/about', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/api', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/tv', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/status', getLocalizedSSR(folderName));
+  server.get(urlPrefix + '/terms-of-service', getLocalizedSSR(folderName));
+
+  // fallback to static file handler so we send HTTP 404 to nginx
+  const distFolder = join(__dirname, '../browser' + (urlPrefix === '' ? '/en-US' : ''));
+  server.get(urlPrefix + '/**', express.static(distFolder, { maxAge: '1y' }));
+}
+
+function getLocalizedSSR(locale) {
+  return (req, res) => {
+    const distFolder = join(__dirname, `../browser/${locale}`);
+    res.render(join(distFolder, 'index.html'), {
+      req,
+      providers: [
+        { provide: APP_BASE_HREF, useValue: req.baseUrl }
+      ]
+    });
+  }
+}
+
 function run(): void {
   const port = process.env.PORT || 4000;
 
diff --git a/production/nginx-mempool-ssr.conf b/production/nginx-mempool-ssr.conf
index 53fd94f1b..3b1be281c 100644
--- a/production/nginx-mempool-ssr.conf
+++ b/production/nginx-mempool-ssr.conf
@@ -45,7 +45,8 @@
 
 		# used to rewrite resources from /<lang>/ to /en-US/
 		location ~ ^/(ar|bg|bs|ca|cs|da|de|et|el|es|eo|eu|fa|fr|gl|ko|hr|id|it|he|ka|lv|lt|hu|mk|ms|nl|ja|ka|no|nb|nn|pl|pt|pt-BR|ro|ru|sk|sl|sr|sh|fi|sv|th|tr|uk|vi|zh)/resources/ {
-			rewrite ^/[a-zA-Z-]*/resources/(.*) /resources/$1;
+			#rewrite ^/[a-zA-Z-]*/resources/(.*) /resources/$1;
+			try_files $uri /en-US/$uri =404;
 		}
 		location /resources/ {
 			try_files $uri /en-US/$uri =404;