diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable.ts
index 3739d1af6fc40..bcca4bdf67dcf 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable.ts
@@ -86,6 +86,7 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
   private domNode: any;
   public readonly type = VISUALIZE_EMBEDDABLE_TYPE;
   private autoRefreshFetchSubscription: Subscription;
+  private abortController?: AbortController;
 
   constructor(
     timefilter: TimefilterContract,
@@ -322,9 +323,14 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
       },
       uiState: this.vis.uiState,
     };
+    if (this.abortController) {
+      this.abortController.abort();
+    }
+    this.abortController = new AbortController();
     this.expression = await buildPipeline(this.vis, {
       timefilter: this.timefilter,
       timeRange: this.timeRange,
+      abortSignal: this.abortController!.signal,
     });
 
     if (this.handler) {
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts
index ea15cd9201fd7..05ae26892b9bd 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts
@@ -490,6 +490,7 @@ export const buildPipeline = async (
   params: {
     timefilter: TimefilterContract;
     timeRange?: any;
+    abortSignal?: AbortSignal;
   }
 ) => {
   const { indexPattern, searchSource } = vis.data;
diff --git a/src/plugins/expressions/public/render_error_handler.ts b/src/plugins/expressions/public/render_error_handler.ts
index 432ef3ed96536..27c3f9c5d8e65 100644
--- a/src/plugins/expressions/public/render_error_handler.ts
+++ b/src/plugins/expressions/public/render_error_handler.ts
@@ -27,6 +27,11 @@ export const renderErrorHandler: RenderErrorHandlerFnType = (
   error: RenderError,
   handlers: IInterpreterRenderHandlers
 ) => {
+  if (error.name === 'AbortError') {
+    handlers.done();
+    return;
+  }
+
   getNotifications().toasts.addError(error, {
     title: i18n.translate('expressions.defaultErrorRenderer.errorTitle', {
       defaultMessage: 'Error in visualisation',