diff --git a/src/plugins/vis_default_editor/public/default_editor.tsx b/src/plugins/vis_default_editor/public/default_editor.tsx
index e9a24d346ff3c..6619fb3dad9cc 100644
--- a/src/plugins/vis_default_editor/public/default_editor.tsx
+++ b/src/plugins/vis_default_editor/public/default_editor.tsx
@@ -60,9 +60,10 @@ function DefaultEditor({
       return;
     }
 
-    embeddableHandler.render(visRef.current);
-    setTimeout(() => {
-      eventEmitter.emit('embeddableRendered');
+    embeddableHandler.render(visRef.current).then(() => {
+      setTimeout(async () => {
+        eventEmitter.emit('embeddableRendered');
+      });
     });
 
     return () => embeddableHandler.destroy();
diff --git a/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts b/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts
index 0c7d58453db69..5868489934dc5 100644
--- a/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts
+++ b/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts
@@ -358,7 +358,7 @@ export class VisualizeEmbeddable
     this.subscriptions.push(this.handler.loading$.subscribe(this.onContainerLoading));
     this.subscriptions.push(this.handler.render$.subscribe(this.onContainerRender));
 
-    this.updateHandler();
+    await this.updateHandler();
   }
 
   public destroy() {