diff --git a/public/app/app.ts b/public/app/app.ts
index 74da01a5788..9058fc9e9e0 100644
--- a/public/app/app.ts
+++ b/public/app/app.ts
@@ -206,13 +206,15 @@ export class GrafanaApp {
     });
 
     registerEchoBackend(new PerformanceBackend({}));
-    registerEchoBackend(
-      new SentryEchoBackend({
-        ...config.sentry,
-        user: config.bootData.user,
-        buildInfo: config.buildInfo,
-      })
-    );
+    if (config.sentry.enabled) {
+      registerEchoBackend(
+        new SentryEchoBackend({
+          ...config.sentry,
+          user: config.bootData.user,
+          buildInfo: config.buildInfo,
+        })
+      );
+    }
 
     window.addEventListener('DOMContentLoaded', () => {
       reportPerformance('dcl', Math.round(performance.now()));