diff --git a/x-pack/solutions/observability/plugins/apm/public/components/app/metrics/static_dashboard/helper.ts b/x-pack/solutions/observability/plugins/apm/public/components/app/metrics/static_dashboard/helper.ts
index 41c9a5ba75c5..ba10ebbf5669 100644
--- a/x-pack/solutions/observability/plugins/apm/public/components/app/metrics/static_dashboard/helper.ts
+++ b/x-pack/solutions/observability/plugins/apm/public/components/app/metrics/static_dashboard/helper.ts
@@ -60,9 +60,8 @@ export async function convertSavedDashboardToPanels(
   const panels = panelsRawObjects.reduce((acc, panel) => {
     const { gridData, embeddableConfig, panelIndex, title } = panel;
     const { attributes } = embeddableConfig;
-    const { state } = attributes;
-    const layers =
-      state.datasourceStates?.formBased?.layers ?? state.datasourceStates?.textBased?.layers ?? [];
+    const datasourceStates = attributes?.state?.datasourceStates ?? {};
+    const layers = datasourceStates.formBased?.layers ?? datasourceStates.textBased?.layers ?? [];
 
     acc[gridData.i] = {
       type: panel.type,
@@ -75,7 +74,7 @@ export async function convertSavedDashboardToPanels(
           ...attributes,
           references: [],
           state: {
-            ...state,
+            ...(attributes?.state ?? {}),
             adHocDataViews: getAdhocDataView(dataView),
             internalReferences: Object.keys(layers).map((layerId) => ({
               id: dataView.id,