diff --git a/frontend/server/app.js b/frontend/server/app.js
index be9c829c..b07fe860 100644
--- a/frontend/server/app.js
+++ b/frontend/server/app.js
@@ -31,9 +31,11 @@ module.exports = function (configLocation) {
     }
     var app = express();
 
+    var backendAddress = config["backend"]["address"];
+    
     /* Define middleware */
     app.use(logger('dev'));
-    app.use('/olympus', createProxyMiddleware({ target: `http://${config["backend"]["address"]}:${config["backend"]["port"]}`, changeOrigin: true }));
+    app.use('/olympus', createProxyMiddleware({ target: `http://${backendAddress === '*'? 'localhost': backendAddress}:${config["backend"]["port"]}`, changeOrigin: true }));
     app.use(bodyParser.json({ limit: '50mb' }));
     app.use(bodyParser.urlencoded({ limit: '50mb', extended: true }));
     app.use(express.static(path.join(__dirname, 'public')));