diff --git a/openvidu-server/src/main/java/io/openvidu/server/core/SessionManager.java b/openvidu-server/src/main/java/io/openvidu/server/core/SessionManager.java
index 3a9806e5..5d0e23b9 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/core/SessionManager.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/core/SessionManager.java
@@ -159,7 +159,7 @@ public abstract class SessionManager {
 		return sessionId;
 	}
 
-	public String newToken(String sessionId, ParticipantRole role, String serverMetadata) {
+	public String newToken(String sessionId, ParticipantRole role, String serverMetadata) throws OpenViduException {
 		if (this.sessionidParticipantpublicidParticipant.get(sessionId) != null
 				&& this.sessionidTokenTokenobj.get(sessionId) != null) {
 			if (isMetadataFormatCorrect(serverMetadata)) {
@@ -169,7 +169,7 @@ public abstract class SessionManager {
 				return token;
 			} else {
 				throw new OpenViduException(Code.GENERIC_ERROR_CODE,
-						"Data invalid format. Max length allowed is 1000 chars");
+						"Data invalid format. Max length allowed is 10000 chars");
 			}
 		} else {
 			System.out.println("Error: the sessionId [" + sessionId + "] is not valid");
@@ -223,8 +223,8 @@ public abstract class SessionManager {
 	}
 
 	public boolean isMetadataFormatCorrect(String metadata) {
-		// Max 1000 chars
-		return (metadata.length() <= 1000);
+		// Max 10000 chars
+		return (metadata.length() <= 10000);
 	}
 
 	public void newInsecureParticipant(String participantPrivateId) {
diff --git a/openvidu-server/src/main/java/io/openvidu/server/rest/SessionRestController.java b/openvidu-server/src/main/java/io/openvidu/server/rest/SessionRestController.java
index 6b664d28..80548235 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/rest/SessionRestController.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/rest/SessionRestController.java
@@ -140,7 +140,7 @@ public class SessionRestController {
 					HttpStatus.BAD_REQUEST);
 		} catch (OpenViduException e) {
 			return this.generateErrorResponse(
-					"Metadata [" + params.get("data") + "] unexpected format. Max length allowed is 1000 chars",
+					"Metadata [" + params.get("data") + "] unexpected format. Max length allowed is 10000 chars",
 					"/api/tokens", HttpStatus.BAD_REQUEST);
 		}
 	}
diff --git a/openvidu-server/src/main/java/io/openvidu/server/rpc/RpcHandler.java b/openvidu-server/src/main/java/io/openvidu/server/rpc/RpcHandler.java
index e00a61c4..0e44c76d 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/rpc/RpcHandler.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/rpc/RpcHandler.java
@@ -157,9 +157,9 @@ public class RpcHandler extends DefaultJsonRpcHandler<JsonObject> {
 				sessionManager.joinRoom(participant, sessionId, request.getId());
 
 			} else {
-				log.error("ERROR: Metadata format is incorrect");
+				log.error("ERROR: Metadata format set in client-side is incorrect");
 				throw new OpenViduException(Code.USER_METADATA_FORMAT_INVALID_ERROR_CODE,
-						"Unable to join room. The metadata received has an invalid format");
+						"Unable to join room. The metadata received from the client-side has an invalid format (max length allowed is 10000 chars)");
 			}
 		} else {
 			log.error("ERROR: sessionId or token not valid");