diff --git a/openvidu-server/src/main/java/io/openvidu/server/core/TokenGenerator.java b/openvidu-server/src/main/java/io/openvidu/server/core/TokenGenerator.java
index a39101b0..8ef7dbdc 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/core/TokenGenerator.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/core/TokenGenerator.java
@@ -47,36 +47,29 @@ public class TokenGenerator {
 		token += "?sessionId=" + sessionId;
 		token += "&token=" + IdentifierPrefixes.TOKEN_ID + RandomStringUtils.randomAlphabetic(1).toUpperCase()
 				+ RandomStringUtils.randomAlphanumeric(15);
-
-		// REMOVE AFTER RELEASE 2.16.0
-		token = compatibilityWithOpenViduBrowser2150(token, role);
-		// REMOVE AFTER RELEASE 2.16.0
-
 		TurnCredentials turnCredentials = null;
 		if (this.openviduConfig.isTurnadminAvailable()) {
 			turnCredentials = coturnCredentialsService.createUser();
 		}
+
+		// REMOVE AFTER RELEASE 2.16.0
+		token = compatibilityWithOpenViduBrowser2150(token, role, turnCredentials);
+		// REMOVE AFTER RELEASE 2.16.0
+
 		ConnectionProperties connectionProperties = new ConnectionProperties.Builder().type(ConnectionType.WEBRTC)
 				.data(serverMetadata).record(record).role(role).kurentoOptions(kurentoOptions).build();
 		return new Token(token, sessionId, connectionProperties, turnCredentials);
 	}
 
 	// REMOVE AFTER RELEASE 2.16.0
-	private String compatibilityWithOpenViduBrowser2150(String token, OpenViduRole role) {
+	private String compatibilityWithOpenViduBrowser2150(String token, OpenViduRole role,
+			TurnCredentials turnCredentials) {
 		token += "&role=" + role.name();
 		token += "&version=" + openviduBuildConfig.getOpenViduServerVersion();
-		TurnCredentials turnCredentials = null;
-		if (this.openviduConfig.isTurnadminAvailable()) {
-			try {
-				turnCredentials = coturnCredentialsService.createUser();
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-			if (turnCredentials != null) {
-				token += "&coturnIp=" + openviduConfig.getCoturnIp();
-				token += "&turnUsername=" + turnCredentials.getUsername();
-				token += "&turnCredential=" + turnCredentials.getCredential();
-			}
+		if (turnCredentials != null) {
+			token += "&coturnIp=" + openviduConfig.getCoturnIp();
+			token += "&turnUsername=" + turnCredentials.getUsername();
+			token += "&turnCredential=" + turnCredentials.getCredential();
 		}
 		return token;
 	}