diff --git a/src/plugins/embeddable/public/embeddable_panel/embeddable_panel.tsx b/src/plugins/embeddable/public/embeddable_panel/embeddable_panel.tsx
index 2c9a30431218d..c24383ff9fb18 100644
--- a/src/plugins/embeddable/public/embeddable_panel/embeddable_panel.tsx
+++ b/src/plugins/embeddable/public/embeddable_panel/embeddable_panel.tsx
@@ -129,8 +129,9 @@ export const EmbeddablePanel = (panelProps: UnwrappedEmbeddablePanelProps) => {
    * Select state from the embeddable
    */
   const loading = useSelectFromEmbeddableOutput('loading', embeddable);
+  const rendered = useSelectFromEmbeddableOutput('rendered', embeddable);
 
-  if (loading === false && !initialLoadComplete) {
+  if ((loading === false || rendered === true || outputError) && !initialLoadComplete) {
     setInitialLoadComplete(true);
   }