diff --git a/server/http-server.c b/server/http-server.c
index 8f6b1fb..89baee1 100644
--- a/server/http-server.c
+++ b/server/http-server.c
@@ -303,7 +303,7 @@ validate_token (HttpServer *htp_server, evhtp_request_t *req,
         pthread_mutex_lock (&htp_server->token_cache_lock);
 
         token_info = g_hash_table_lookup (htp_server->token_cache, token);
-        if (token_info) {
+        if (token_info && strcmp (token_info->repo_id, repo_id) == 0) {
             if (username)
                 *username = g_strdup(token_info->email);
             pthread_mutex_unlock (&htp_server->token_cache_lock);