diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/SubscriberEndpoint.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/SubscriberEndpoint.java
index 1a159ada..31c7fea7 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/SubscriberEndpoint.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/SubscriberEndpoint.java
@@ -58,7 +58,6 @@ public class SubscriberEndpoint extends MediaEndpoint {
 		offerOptions.setOfferToReceiveVideo(publisher.getMediaOptions().hasVideo());
 		String sdpOffer = generateOffer(offerOptions);
 
-		gatherCandidates();
 		return sdpOffer;
 	}
 
@@ -75,7 +74,9 @@ public class SubscriberEndpoint extends MediaEndpoint {
 			return realSdpAnswer;
 		} else {
 			// 2.18.0
-			return processAnswer(sdpAnswer);
+			processAnswer(sdpAnswer);
+			gatherCandidates();
+			return null;
 		}
 		// END TODO