diff --git a/x-pack/solutions/observability/plugins/infra/public/pages/logs/log_entry_categories/page.tsx b/x-pack/solutions/observability/plugins/infra/public/pages/logs/log_entry_categories/page.tsx
index 650a5b119d755..49c97b5276463 100644
--- a/x-pack/solutions/observability/plugins/infra/public/pages/logs/log_entry_categories/page.tsx
+++ b/x-pack/solutions/observability/plugins/infra/public/pages/logs/log_entry_categories/page.tsx
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import { EuiErrorBoundary } from '@elastic/eui';
 import React from 'react';
 import { MissingResultsPrivilegesPrompt } from '../../../components/logging/log_analysis_setup';
 import { useLogAnalysisCapabilitiesContext } from '../../../containers/logs/log_analysis';
@@ -46,12 +45,10 @@ export const LogEntryCategoriesPage = () => {
   }
 
   return (
-    <EuiErrorBoundary>
-      <LogMlJobIdFormatsShimProvider>
-        <LogEntryCategoriesPageProviders>
-          <LogEntryCategoriesPageContent />
-        </LogEntryCategoriesPageProviders>
-      </LogMlJobIdFormatsShimProvider>
-    </EuiErrorBoundary>
+    <LogMlJobIdFormatsShimProvider>
+      <LogEntryCategoriesPageProviders>
+        <LogEntryCategoriesPageContent />
+      </LogEntryCategoriesPageProviders>
+    </LogMlJobIdFormatsShimProvider>
   );
 };
diff --git a/x-pack/solutions/observability/plugins/infra/public/pages/logs/log_entry_rate/page.tsx b/x-pack/solutions/observability/plugins/infra/public/pages/logs/log_entry_rate/page.tsx
index ed46ea9dc2680..b9dca6904c94e 100644
--- a/x-pack/solutions/observability/plugins/infra/public/pages/logs/log_entry_rate/page.tsx
+++ b/x-pack/solutions/observability/plugins/infra/public/pages/logs/log_entry_rate/page.tsx
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import { EuiErrorBoundary } from '@elastic/eui';
 import React from 'react';
 import { SubscriptionSplashPage } from '../../../components/subscription_splash_content';
 import { MissingResultsPrivilegesPrompt } from '../../../components/logging/log_analysis_setup';
@@ -46,12 +45,10 @@ export const LogEntryRatePage = () => {
   }
 
   return (
-    <EuiErrorBoundary>
-      <LogMlJobIdFormatsShimProvider>
-        <LogEntryRatePageProviders>
-          <LogEntryRatePageContent />
-        </LogEntryRatePageProviders>
-      </LogMlJobIdFormatsShimProvider>
-    </EuiErrorBoundary>
+    <LogMlJobIdFormatsShimProvider>
+      <LogEntryRatePageProviders>
+        <LogEntryRatePageContent />
+      </LogEntryRatePageProviders>
+    </LogMlJobIdFormatsShimProvider>
   );
 };
diff --git a/x-pack/solutions/observability/plugins/infra/public/pages/logs/page.tsx b/x-pack/solutions/observability/plugins/infra/public/pages/logs/page.tsx
index 3f4e308ef7ed7..38ea111fde541 100644
--- a/x-pack/solutions/observability/plugins/infra/public/pages/logs/page.tsx
+++ b/x-pack/solutions/observability/plugins/infra/public/pages/logs/page.tsx
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import { EuiErrorBoundary } from '@elastic/eui';
 import React from 'react';
 import type { RouteComponentProps } from 'react-router-dom';
 import { LogsPageContent } from './page_content';
@@ -13,10 +12,8 @@ import { LogsPageProviders } from './page_providers';
 
 export const LogsPage: React.FunctionComponent<RouteComponentProps> = () => {
   return (
-    <EuiErrorBoundary>
-      <LogsPageProviders>
-        <LogsPageContent />
-      </LogsPageProviders>
-    </EuiErrorBoundary>
+    <LogsPageProviders>
+      <LogsPageContent />
+    </LogsPageProviders>
   );
 };
diff --git a/x-pack/solutions/observability/plugins/observability_onboarding/public/application/app.tsx b/x-pack/solutions/observability/plugins/observability_onboarding/public/application/app.tsx
index b09ca846aee43..b6a6f506f59a5 100644
--- a/x-pack/solutions/observability/plugins/observability_onboarding/public/application/app.tsx
+++ b/x-pack/solutions/observability/plugins/observability_onboarding/public/application/app.tsx
@@ -5,13 +5,11 @@
  * 2.0.
  */
 
-import { EuiErrorBoundary } from '@elastic/eui';
 import { AppMountParameters, APP_WRAPPER_CLASS, CoreStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { PerformanceContextProvider } from '@kbn/ebt-tools';
 import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { KibanaRenderContextProvider } from '@kbn/react-kibana-context-render';
-import { KibanaThemeProvider } from '@kbn/react-kibana-context-theme';
 import { RedirectAppLinks } from '@kbn/shared-ux-link-redirect-app';
 import { Router } from '@kbn/shared-ux-router';
 import React from 'react';
@@ -54,7 +52,16 @@ export function ObservabilityOnboardingAppRoot({
   };
 
   return (
-    <KibanaRenderContextProvider {...core}>
+    <KibanaRenderContextProvider
+      {...core}
+      theme={{ theme$ }}
+      modify={{
+        breakpoint: {
+          xxl: 1600,
+          xxxl: 2000,
+        },
+      }}
+    >
       <div className={APP_WRAPPER_CLASS}>
         <RedirectAppLinks
           coreStart={{
@@ -62,27 +69,17 @@ export function ObservabilityOnboardingAppRoot({
           }}
         >
           <KibanaContextProvider services={services}>
-            <KibanaThemeProvider
-              theme={{ theme$ }}
-              modify={{
-                breakpoint: {
-                  xxl: 1600,
-                  xxxl: 2000,
-                },
-              }}
-            >
-              <Router history={history}>
-                <PerformanceContextProvider>
-                  <EuiErrorBoundary>
-                    <ObservabilityOnboardingHeaderActionMenu
-                      setHeaderActionMenu={setHeaderActionMenu}
-                      theme$={theme$}
-                    />
-                    <ObservabilityOnboardingFlow />
-                  </EuiErrorBoundary>
-                </PerformanceContextProvider>
-              </Router>
-            </KibanaThemeProvider>
+            <Router history={history}>
+              <PerformanceContextProvider>
+                <>
+                  <ObservabilityOnboardingHeaderActionMenu
+                    setHeaderActionMenu={setHeaderActionMenu}
+                    theme$={theme$}
+                  />
+                  <ObservabilityOnboardingFlow />
+                </>
+              </PerformanceContextProvider>
+            </Router>
           </KibanaContextProvider>
         </RedirectAppLinks>
       </div>
diff --git a/x-pack/solutions/observability/plugins/observability_onboarding/tsconfig.json b/x-pack/solutions/observability/plugins/observability_onboarding/tsconfig.json
index 45dd11b9106fc..7976be4ad70bf 100644
--- a/x-pack/solutions/observability/plugins/observability_onboarding/tsconfig.json
+++ b/x-pack/solutions/observability/plugins/observability_onboarding/tsconfig.json
@@ -34,7 +34,6 @@
     "@kbn/fleet-plugin",
     "@kbn/shared-ux-link-redirect-app",
     "@kbn/react-kibana-context-render",
-    "@kbn/react-kibana-context-theme",
     "@kbn/discover-plugin",
     "@kbn/spaces-plugin",
     "@kbn/deeplinks-analytics",