diff --git a/openvidu-basic-java/src/main/java/io/openvidu/basic/java/Controller.java b/openvidu-basic-java/src/main/java/io/openvidu/basic/java/Controller.java
index 65f031d9..9380db48 100644
--- a/openvidu-basic-java/src/main/java/io/openvidu/basic/java/Controller.java
+++ b/openvidu-basic-java/src/main/java/io/openvidu/basic/java/Controller.java
@@ -7,6 +7,7 @@ import javax.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -20,6 +21,7 @@ import io.openvidu.java.client.OpenViduJavaClientException;
 import io.openvidu.java.client.Session;
 import io.openvidu.java.client.SessionProperties;
 
+@CrossOrigin(origins = "*")
 @RestController
 public class Controller {
 
@@ -57,9 +59,7 @@ public class Controller {
 	public ResponseEntity<String> createConnection(@PathVariable("sessionId") String sessionId,
 			@RequestBody(required = false) Map<String, Object> params)
 			throws OpenViduJavaClientException, OpenViduHttpException {
-		openvidu.fetch();
-		Session session = openvidu.getActiveSessions().stream().filter(s -> sessionId.equals(s.getSessionId()))
-				.findFirst().orElse(null);
+		Session session = openvidu.getActiveSession(sessionId);
 		if (session == null) {
 			return new ResponseEntity<>(HttpStatus.NOT_FOUND);
 		}