diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_app/public/utils/shared_providers.tsx b/x-pack/plugins/observability_solution/observability_ai_assistant_app/public/utils/shared_providers.tsx
index 49776f4622250..dd950886c24e9 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_app/public/utils/shared_providers.tsx
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_app/public/utils/shared_providers.tsx
@@ -4,7 +4,6 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { EuiErrorBoundary } from '@elastic/eui';
 import type { CoreStart, CoreTheme } from '@kbn/core/public';
 import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { KibanaThemeProvider } from '@kbn/react-kibana-context-theme';
@@ -31,23 +30,21 @@ export function SharedProviders({
     return { theme$ };
   }, [theme$]);
 
-  return (
-    <EuiErrorBoundary>
-      <KibanaThemeProvider theme={theme}>
-        <KibanaContextProvider
-          services={{
-            ...coreStart,
-            ...pluginsStart,
-            plugins: {
-              start: pluginsStart,
-            },
-          }}
-        >
-          <RedirectAppLinks coreStart={coreStart}>
-            <coreStart.i18n.Context>{children}</coreStart.i18n.Context>
-          </RedirectAppLinks>
-        </KibanaContextProvider>
-      </KibanaThemeProvider>
-    </EuiErrorBoundary>
+  return coreStart.rendering.addContext(
+    <KibanaThemeProvider theme={theme}>
+      <KibanaContextProvider
+        services={{
+          ...coreStart,
+          ...pluginsStart,
+          plugins: {
+            start: pluginsStart,
+          },
+        }}
+      >
+        <RedirectAppLinks coreStart={coreStart}>
+          <coreStart.i18n.Context>{children}</coreStart.i18n.Context>
+        </RedirectAppLinks>
+      </KibanaContextProvider>
+    </KibanaThemeProvider>
   );
 }