diff --git a/public/app/features/live/LiveConnectionWarning.tsx b/public/app/features/live/LiveConnectionWarning.tsx
index a4d18d34405..54f23413c93 100644
--- a/public/app/features/live/LiveConnectionWarning.tsx
+++ b/public/app/features/live/LiveConnectionWarning.tsx
@@ -45,8 +45,8 @@ export class LiveConnectionWarning extends PureComponent<Props, State> {
   render() {
     const { show } = this.state;
     if (show) {
-      if (!contextSrv.isSignedIn || !config.liveEnabled) {
-        return null; // do not show the warning for anonymous users (and /login page etc)
+      if (!contextSrv.isSignedIn || !config.liveEnabled || contextSrv.user.orgRole === '') {
+        return null; // do not show the warning for anonymous users or ones with no org (and /login page etc)
       }
 
       return (