diff --git a/public/app/core/services/context_srv.ts b/public/app/core/services/context_srv.ts
index 09e8ce1c731..deb0d0dda1c 100644
--- a/public/app/core/services/context_srv.ts
+++ b/public/app/core/services/context_srv.ts
@@ -74,7 +74,11 @@ export class ContextSrv {
   }
 
   hasRole(role: string) {
-    return this.user.orgRole === role;
+    if (role === 'ServerAdmin') {
+      return this.isGrafanaAdmin;
+    } else {
+      return this.user.orgRole === role;
+    }
   }
 
   accessControlEnabled(): boolean {