diff --git a/ui/src/env.ts b/ui/src/env.ts
index 03594bc68..aebbc57f6 100644
--- a/ui/src/env.ts
+++ b/ui/src/env.ts
@@ -1,2 +1,4 @@
-export const endpoint = `${window.location.hostname}:8536`;
+let host = `${window.location.hostname}`;
+let port = `${window.location.port == "4444" ? '8536' : window.location.port}`;
+let endpoint = `${host}:${port}`;
 export let wsUri = `${(window.location.protocol=='https:') ? 'wss://' : 'ws://'}${endpoint}/service/ws`;