diff --git a/smart-hut/src/client_server.js b/smart-hut/src/client_server.js
index d7a9951..7736894 100644
--- a/smart-hut/src/client_server.js
+++ b/smart-hut/src/client_server.js
@@ -2,7 +2,12 @@
 
 import axios from "axios";
 
-let config = window.BACKEND_URL || "http://localhost:8080/";
+let config;
+if (window.BACKEND_URL !== "__BACKEND_URL__") {
+  config = window.BACKEND_URL + "/";
+} else {
+  config = "http://localhost:8080/";
+}
 var tkn = localStorage.getItem("token");
 
 /** the ServiceSocket instance valid for the current session */