diff --git a/openvidu-browser/ts/OpenVidu/tsconfig.json b/openvidu-browser/ts/OpenVidu/tsconfig.json
index 11f2be0c..adeb71b8 100644
--- a/openvidu-browser/ts/OpenVidu/tsconfig.json
+++ b/openvidu-browser/ts/OpenVidu/tsconfig.json
@@ -24,5 +24,5 @@
 		"sourceMap": true
 	},
 	//"buildOnSave": true,
-	"compileOnSave":true
+	"compileOnSave": true
 }
\ No newline at end of file
diff --git a/openvidu-server/src/main/java/io/openvidu/server/OpenViduServer.java b/openvidu-server/src/main/java/io/openvidu/server/OpenViduServer.java
index 83c4329a..223df1b3 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/OpenViduServer.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/OpenViduServer.java
@@ -16,6 +16,7 @@
 package io.openvidu.server;
 
 import java.io.IOException;
+import java.net.URL;
 import java.util.List;
 
 import org.kurento.jsonrpc.JsonUtils;
@@ -168,11 +169,22 @@ public class OpenViduServer implements JsonRpcConfigurer {
 			break;
 
 		default:
+			
+			URL url = new URL(publicUrl);
+			int port = url.getPort();
+			
 			type = "custom";
 			OpenViduServer.publicUrl = publicUrl.replaceFirst("https://", "wss://");
 			if (!OpenViduServer.publicUrl.startsWith("wss://")) {
 				OpenViduServer.publicUrl = "wss://" + OpenViduServer.publicUrl;
 			}
+			if (OpenViduServer.publicUrl.endsWith("/")) {
+				OpenViduServer.publicUrl = OpenViduServer.publicUrl.substring(0, OpenViduServer.publicUrl.length() - 1);
+			}
+			if (port == -1) {
+				OpenViduServer.publicUrl += ":" + openviduConf.getServerPort();
+			}
+			
 			break;
 		}
 
diff --git a/openvidu-testapp/package.json b/openvidu-testapp/package.json
index a686bd89..8c7a4fd7 100644
--- a/openvidu-testapp/package.json
+++ b/openvidu-testapp/package.json
@@ -33,7 +33,7 @@
     }, 
     "devDependencies": {
         "@angular/language-service": "^4.2.4", 
-        "@angular/cli": "1.6.3", 
+        "@angular/cli": "1.4.3", 
         "@angular/compiler-cli": "^4.2.4", 
         "@types/jasminewd2": "~2.0.2", 
         "@types/jasmine": "~2.5.53", 
@@ -42,7 +42,7 @@
         "karma-jasmine": "~1.1.0", 
         "karma-cli": "~1.0.1", 
         "karma-chrome-launcher": "2.2.0", 
-        "typescript": "2.6.2", 
+        "typescript": "2.3.3", 
         "karma-coverage-istanbul-reporter": "^1.3.0", 
         "karma": "1.7.1", 
         "karma-jasmine-html-reporter": "^0.2.2",