From 8d5a9f30bc9641036c8276ce9ec72814db2c8a49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Thu, 17 Jun 2021 14:39:52 +0200
Subject: [PATCH] Login: Fixes Unauthorized message showing when on login page
 or snapshot page (#35311) (#35880)

(cherry picked from commit ce513e4637e2f8fbe56bb8a8c9077bf57a798ca2)
---
 lerna.json        | 4 +---
 public/app/app.ts | 6 ++++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lerna.json b/lerna.json
index 258479a8963..d6a3ceea604 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,8 +1,6 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "packages": [
-    "packages/*"
-  ],
+  "packages": ["packages/*"],
   "version": "7.5.8"
 }
diff --git a/public/app/app.ts b/public/app/app.ts
index c51a353541e..b0c2130e36c 100644
--- a/public/app/app.ts
+++ b/public/app/app.ts
@@ -34,7 +34,7 @@ import { checkBrowserCompatibility } from 'app/core/utils/browser';
 import { arrayMove } from 'app/core/utils/arrayMove';
 import { importPluginModule } from 'app/features/plugins/plugin_loader';
 import { angularModules, coreModule } from 'app/core/core_module';
-import { registerAngularDirectives } from 'app/core/core';
+import { contextSrv, registerAngularDirectives } from 'app/core/core';
 import { setupAngularRoutes } from 'app/routes/routes';
 import { registerEchoBackend, setEchoSrv } from '@grafana/runtime';
 import { Echo } from './core/services/echo/Echo';
@@ -212,7 +212,9 @@ export class GrafanaApp {
       }
     });
 
-    registerEchoBackend(new PerformanceBackend({}));
+    if (contextSrv.user.orgRole !== '') {
+      registerEchoBackend(new PerformanceBackend({}));
+    }
 
     if (config.sentry.enabled) {
       registerEchoBackend(