diff --git a/msa/web-ui/server.js b/msa/web-ui/server.js
index eea9afc333..6c69d49597 100644
--- a/msa/web-ui/server.js
+++ b/msa/web-ui/server.js
@@ -65,23 +65,26 @@ var server;
 
             apiProxy.on('error', function (err, req, res) {
                 logger.warn('API proxy error: %s', err.message);
-                res.writeHead(500);
-                if (err.code && err.code === 'ECONNREFUSED') {
+                if (res.writeHead) {
+                  res.writeHead(500);
+                  if (err.code && err.code === 'ECONNREFUSED') {
                     res.end('Unable to connect to ThingsBoard server.');
-                } else {
+                  } else {
                     res.end('Thingsboard server connection error: ' + err.code ? err.code : '');
+                  }
                 }
             });
-        }
-
-        if (useApiProxy) {
             app.all('/api/*', (req, res) => {
-                logger.debug(req.method + ' ' + req.originalUrl);
-                apiProxy.web(req, res);
+              logger.debug(req.method + ' ' + req.originalUrl);
+              apiProxy.web(req, res);
             });
 
             app.all('/static/rulenode/*', (req, res) => {
-                apiProxy.web(req, res);
+              apiProxy.web(req, res);
+            });
+
+            server.on('upgrade', (req, socket, head) => {
+              apiProxy.ws(req, socket, head);
             });
         }
 
@@ -92,16 +95,6 @@ var server;
 
         app.use(express.static(root));
 
-        if (useApiProxy) {
-            app.get('*', (req, res) => {
-                apiProxy.web(req, res);
-            });
-
-            server.on('upgrade', (req, socket, head) => {
-                apiProxy.ws(req, socket, head);
-            });
-        }
-
         server.listen(bindPort, bindAddress, (error) => {
             if (error) {
                 logger.error('Failed to start ThingsBoard Web UI Microservice: %s', e.message);