diff --git a/ui/package.json b/ui/package.json
index 37152a58a5..6e5e6eac19 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "thingsboard",
   "private": true,
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "Thingsboard UI",
   "licenses": [
     {
diff --git a/ui/src/app/api/telemetry-websocket.service.js b/ui/src/app/api/telemetry-websocket.service.js
index e03aafa087..e69c26493d 100644
--- a/ui/src/app/api/telemetry-websocket.service.js
+++ b/ui/src/app/api/telemetry-websocket.service.js
@@ -45,15 +45,21 @@ function TelemetryWebsocketService($rootScope, $websocket, $timeout, $window, ty
         socketCloseTimer,
         reconnectTimer;
 
+    var port = location.port;
     if (location.protocol === "https:") {
+        if (!port) {
+            port = "443";
+        }
         telemetryUri = "wss:";
     } else {
+        if (!port) {
+            port = "80";
+        }
         telemetryUri = "ws:";
     }
-    telemetryUri += "//" + location.hostname + ":" + location.port;
+    telemetryUri += "//" + location.hostname + ":" + port;
     telemetryUri += "/api/ws/plugins/telemetry";
 
-
     var service = {
         subscribe: subscribe,
         unsubscribe: unsubscribe