diff --git a/public/app/core/services/context_srv.ts b/public/app/core/services/context_srv.ts
index 502d6fa72e8..f368133a68e 100644
--- a/public/app/core/services/context_srv.ts
+++ b/public/app/core/services/context_srv.ts
@@ -269,6 +269,11 @@ export class ContextSrv {
       return false;
     }
 
+    // skip if the user has been authenticated by JWT auth
+    if (this.user.authenticatedBy === 'jwt') {
+      return false;
+    }
+
     return true;
   }