diff --git a/openvidu-server/docker/openvidu-docker-compose/docker-compose.yml b/openvidu-server/docker/openvidu-docker-compose/docker-compose.yml
index 4e6f3efc..16f19a2c 100644
--- a/openvidu-server/docker/openvidu-docker-compose/docker-compose.yml
+++ b/openvidu-server/docker/openvidu-docker-compose/docker-compose.yml
@@ -18,7 +18,7 @@ version: '3.1'
 services:
 
     openvidu-server:
-        image: openvidu/openvidu-server:2.13.0-beta3
+        image: openvidu/openvidu-server:2.13.0-beta4
         restart: on-failure
         network_mode: host
         volumes:
diff --git a/openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java b/openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java
index f4a02464..4a2bea1a 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java
@@ -539,8 +539,8 @@ public class OpenviduConfig {
 				OpenViduServer.wsUrl = publicUrl.replace("http://", "wss://");
 			}
 
-			if (!OpenViduServer.wsUrl.startsWith("wss://")) {
-				OpenViduServer.wsUrl = "wss://" + OpenViduServer.wsUrl;
+			if (!publicUrl.startsWith("wss://")) {
+				OpenViduServer.wsUrl = "wss://" + publicUrl;
 			}
 		}