diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/MediaEndpoint.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/MediaEndpoint.java
index 70a5c70e..919237c2 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/MediaEndpoint.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/MediaEndpoint.java
@@ -214,10 +214,10 @@ public abstract class MediaEndpoint {
 			internalEndpointInitialization(endpointLatch);
 		} else {
 			endpointLatch.countDown();
-		}
-		if (this.isWeb()) {
-			while (!candidates.isEmpty()) {
-				internalAddIceCandidate(candidates.removeFirst());
+			if (this.isWeb()) {
+				while (!candidates.isEmpty()) {
+					internalAddIceCandidate(candidates.removeFirst());
+				}
 			}
 		}
 		return old;
@@ -291,6 +291,11 @@ public abstract class MediaEndpoint {
 					}
 
 					endpointLatch.countDown();
+
+					while (!candidates.isEmpty()) {
+						internalAddIceCandidate(candidates.removeFirst());
+					}
+
 					log.trace("EP {}: Created a new WebRtcEndpoint", endpointName);
 					endpointSubscription = registerElemErrListener(webEndpoint);