diff --git a/Projects/Foundations/TS/Task-Modules/EventServerClient.js b/Projects/Foundations/TS/Task-Modules/EventServerClient.js
index add819ab3..9c1743978 100644
--- a/Projects/Foundations/TS/Task-Modules/EventServerClient.js
+++ b/Projects/Foundations/TS/Task-Modules/EventServerClient.js
@@ -23,10 +23,10 @@
     if (host === undefined) {
         host = 'localhost'
     }
-    if (port === undefined) {
+    if (port === undefined || port !== global.env.CLIENT_WEB_SOCKETS_INTERFACE_PORT) {
         port = global.env.CLIENT_WEB_SOCKETS_INTERFACE_PORT  
     }
-     
+
     let messageCounter = 0
     let commandCounter = 0 
 
@@ -202,4 +202,4 @@
         }
         sendCommand(eventCommand, responseCallBack)
     }
-}
\ No newline at end of file
+}