From 3f212836553e4f33508fd812c609937f828aed84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Thu, 30 Jul 2020 10:23:39 +0200
Subject: [PATCH] Annotations: Ignore cancelled annotation queries (#26681)

---
 public/app/features/annotations/annotations_srv.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/public/app/features/annotations/annotations_srv.ts b/public/app/features/annotations/annotations_srv.ts
index 39127651c3d..971e5a245ff 100644
--- a/public/app/features/annotations/annotations_srv.ts
+++ b/public/app/features/annotations/annotations_srv.ts
@@ -59,9 +59,14 @@ export class AnnotationsSrv {
         };
       })
       .catch(err => {
+        if (err.cancelled) {
+          return [];
+        }
+
         if (!err.message && err.data && err.data.message) {
           err.message = err.data.message;
         }
+
         console.error('AnnotationSrv.query error', err);
         appEvents.emit(AppEvents.alertError, ['Annotation Query Failed', err.message || err]);
         return [];