diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx
index e9050d313fba..73e839433c25 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx
@@ -24,7 +24,7 @@ import { CANVAS_EMBEDDABLE_CLASSNAME } from '../../../common/lib';
 const { embeddable: strings } = RendererStrings;
 
 const embeddablesRegistry: {
-  [key: string]: IEmbeddable;
+  [key: string]: IEmbeddable | Promise<IEmbeddable>;
 } = {};
 
 const renderEmbeddableFactory = (core: CoreStart, plugins: StartDeps) => {
@@ -67,7 +67,15 @@ export const embeddableRendererFactory = (
           throw new EmbeddableFactoryNotFoundError(embeddableType);
         }
 
-        const embeddableObject = await factory.createFromSavedObject(input.id, input);
+        const embeddablePromise = factory
+          .createFromSavedObject(input.id, input)
+          .then((embeddable) => {
+            embeddablesRegistry[uniqueId] = embeddable;
+            return embeddable;
+          });
+        embeddablesRegistry[uniqueId] = embeddablePromise;
+
+        const embeddableObject = await (async () => embeddablePromise)();
 
         const palettes = await plugins.charts.palettes.getPalettes();
 
@@ -105,8 +113,12 @@ export const embeddableRendererFactory = (
           return ReactDOM.unmountComponentAtNode(domNode);
         });
       } else {
-        embeddablesRegistry[uniqueId].updateInput(input);
-        embeddablesRegistry[uniqueId].reload();
+        const embeddable = embeddablesRegistry[uniqueId];
+
+        if ('updateInput' in embeddable) {
+          embeddable.updateInput(input);
+          embeddable.reload();
+        }
       }
     },
   });