diff --git a/Desktop/UI/Globals.js b/Desktop/UI/Globals.js
index 4599bca36..2c5646491 100644
--- a/Desktop/UI/Globals.js
+++ b/Desktop/UI/Globals.js
@@ -4,6 +4,7 @@ let UI = {
     projects: {},
     schemas: { projectSchema: undefined },
     environment: undefined,
+    clientNode: undefined,
     running: {}
 }
 
diff --git a/Desktop/UI/WebAppPreLoader.js b/Desktop/UI/WebAppPreLoader.js
index 0c691e566..548e3da05 100644
--- a/Desktop/UI/WebAppPreLoader.js
+++ b/Desktop/UI/WebAppPreLoader.js
@@ -22,6 +22,15 @@ function loadSuperalgos() {
 
         function onResponse(err, file) {
             UI.environment = JSON.parse(file)
+            setupClientNode()
+        }
+    }
+
+    function setupClientNode() {
+        httpRequest(undefined, 'ClientNode', onResponse)
+
+        function onResponse(err, file) {
+            UI.clientNode = JSON.parse(file)
             setupProjectsSchema()
         }
     }
diff --git a/Projects/Social-Trading/DK/modules/httpInterface.js b/Projects/Social-Trading/DK/modules/httpInterface.js
index ad48537b0..639e1e360 100644
--- a/Projects/Social-Trading/DK/modules/httpInterface.js
+++ b/Projects/Social-Trading/DK/modules/httpInterface.js
@@ -40,6 +40,11 @@ exports.newDesktopModulesHttpInterface = function newDesktopModulesHttpInterface
                         SA.projects.foundations.utilities.httpResponses.respondWithContent(JSON.stringify(global.env), httpResponse)
                     }
                     break
+                case 'ClientNode':
+                    {
+                        SA.projects.foundations.utilities.httpResponses.respondWithContent(JSON.stringify(DK.desktopApp.p2pNetworkClient.node), httpResponse)
+                    }
+                    break
                 case 'ProjectsSchema':
                     {
                         let path = global.env.PATH_TO_PROJECTS + '/' + 'ProjectsSchema.json'
diff --git a/Projects/Social-Trading/UI/modules/WebSocketsWebClient.js b/Projects/Social-Trading/UI/modules/WebSocketsWebClient.js
index e0512c462..da9fb2730 100644
--- a/Projects/Social-Trading/UI/modules/WebSocketsWebClient.js
+++ b/Projects/Social-Trading/UI/modules/WebSocketsWebClient.js
@@ -24,7 +24,7 @@ function newSocialTradingModulesWebSocketsWebClient() {
 
     async function initialize() {
 
-        socketClient = new WebSocket('ws://' + UI.environment.DESKTOP_WEB_SOCKETS_INTERFACE_HOST + ':' + UI.environment.DESKTOP_WEB_SOCKETS_INTERFACE_PORT)
+        socketClient = new WebSocket('ws://' + JSON.parse(UI.clientNode.config).host + ':' + JSON.parse(UI.clientNode.config).webSocketsPort)
 
         await setUpWebsocketClient()
     }