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

---
 public/app/app.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/app/app.ts b/public/app/app.ts
index 123d1d367d8..13782b275a5 100644
--- a/public/app/app.ts
+++ b/public/app/app.ts
@@ -45,6 +45,7 @@ import { QueryRunner } from './features/query/state/QueryRunner';
 import { getTimeSrv } from './features/dashboard/services/TimeSrv';
 import { getVariablesUrlParams } from './features/variables/getAllVariableValuesForUrl';
 import getDefaultMonacoLanguages from '../lib/monaco-languages';
+import { contextSrv } from './core/services/context_srv';
 
 // add move to lodash for backward compatabilty with plugins
 // @ts-ignore
@@ -146,7 +147,9 @@ function initEchoSrv() {
     }
   });
 
-  registerEchoBackend(new PerformanceBackend({}));
+  if (contextSrv.user.orgRole !== '') {
+    registerEchoBackend(new PerformanceBackend({}));
+  }
 
   if (config.sentry.enabled) {
     registerEchoBackend(