diff --git a/src/main/java/org/gcube/smartgears/handlers/application/request/RequestValidator.java b/src/main/java/org/gcube/smartgears/handlers/application/request/RequestValidator.java
index e8df27a..5b9aee8 100644
--- a/src/main/java/org/gcube/smartgears/handlers/application/request/RequestValidator.java
+++ b/src/main/java/org/gcube/smartgears/handlers/application/request/RequestValidator.java
@@ -134,7 +134,7 @@ public class RequestValidator extends RequestHandler {
 		Secret secret = null;
 		if (accessToken!=null) 
 			secret = new AccessTokenSecret(accessToken);
-		else if (token!=null) 
+		else if (token!=null && !token.isEmpty()) 
 				secret = new GCubeSecret(token);
 		return secret;
 	}