diff --git a/frontend/app-development/features/processEditor/bpmnHandlerUtils/bpmnHandlerUtils.ts b/frontend/app-development/features/processEditor/bpmnHandlerUtils/bpmnHandlerUtils.ts
index 4ea9be4742c..f2e6a8ca2e0 100644
--- a/frontend/app-development/features/processEditor/bpmnHandlerUtils/bpmnHandlerUtils.ts
+++ b/frontend/app-development/features/processEditor/bpmnHandlerUtils/bpmnHandlerUtils.ts
@@ -1,6 +1,6 @@
 import type { LayoutSets } from 'app-shared/types/api/LayoutSetsResponse';
 
 export const getLayoutSetIdFromTaskId = (elementId: string, layoutSets: LayoutSets) => {
-  const layoutSet = layoutSets.sets.find((set) => set.tasks[0] === elementId);
+  const layoutSet = layoutSets.sets.find((set) => set.tasks && set?.tasks[0] === elementId);
   return layoutSet?.id;
 };
diff --git a/frontend/packages/process-editor/src/components/ConfigPanel/ConfigContent/ConfigContent.tsx b/frontend/packages/process-editor/src/components/ConfigPanel/ConfigContent/ConfigContent.tsx
index 563d8389632..b99cb379853 100644
--- a/frontend/packages/process-editor/src/components/ConfigPanel/ConfigContent/ConfigContent.tsx
+++ b/frontend/packages/process-editor/src/components/ConfigPanel/ConfigContent/ConfigContent.tsx
@@ -72,7 +72,7 @@ export const ConfigContent = (): React.ReactElement => {
               <Accordion.Content className={classes.accordion}>
                 <EditLayoutSetName existingLayoutSetName={layoutSet.id} />
                 <EditDataTypes
-                  connectedTaskId={layoutSet?.tasks[0]}
+                  connectedTaskId={layoutSet.tasks[0]}
                   dataModelIds={availableDataModelIds}
                   existingDataTypeForTask={existingDataTypeForTask}
                 />
diff --git a/frontend/packages/process-editor/src/components/ConfigPanel/ConfigContent/EditLayoutSetNameRecommendedAction/RecommendedActionChangeName.tsx b/frontend/packages/process-editor/src/components/ConfigPanel/ConfigContent/EditLayoutSetNameRecommendedAction/RecommendedActionChangeName.tsx
index b3c91dcbe33..aa2a37c720a 100644
--- a/frontend/packages/process-editor/src/components/ConfigPanel/ConfigContent/EditLayoutSetNameRecommendedAction/RecommendedActionChangeName.tsx
+++ b/frontend/packages/process-editor/src/components/ConfigPanel/ConfigContent/EditLayoutSetNameRecommendedAction/RecommendedActionChangeName.tsx
@@ -25,7 +25,6 @@ export const RecommendedActionChangeName = (): React.ReactElement => {
     if (newNameError || newName === '') {
       return false;
     }
-
     mutateLayoutSetId({ layoutSetIdToUpdate: bpmnDetails.element.id, newLayoutSetId: newName });
     removeAction(bpmnDetails.element.id);
   };