diff --git a/apps/dispatch/app/_store/pilot/dmeStore.ts b/apps/dispatch/app/_store/pilot/dmeStore.ts
index 54e58546..654ffe87 100644
--- a/apps/dispatch/app/_store/pilot/dmeStore.ts
+++ b/apps/dispatch/app/_store/pilot/dmeStore.ts
@@ -149,8 +149,7 @@ export const useDmeStore = create<MrtStore>(
 								{
 									textLeft: pageData.mission.addressAdditionalInfo || "keine Daten",
 								},
-								...(pageData.mission.addressMissionDestination &&
-								pageData.mission.addressMissionDestination.length > 0
+								...(pageData.mission.type === "sekundär"
 									? [
 											{
 												textMid: "Zielort:",
@@ -161,20 +160,30 @@ export const useDmeStore = create<MrtStore>(
 											},
 										]
 									: []),
-								{
-									textMid: "Patienteninfos:",
-									style: { fontWeight: "bold" },
-								},
-								{
-									textLeft: pageData.mission.missionPatientInfo || "keine Daten",
-								},
-								{
-									textMid: "Weitere Infos:",
-									style: { fontWeight: "bold" },
-								},
-								{
-									textLeft: pageData.mission.missionAdditionalInfo || "keine Daten",
-								},
+								...(pageData.mission.missionPatientInfo &&
+								pageData.mission.missionPatientInfo.length > 0
+									? [
+											{
+												textMid: "Patienteninfos:",
+												style: { fontWeight: "bold" },
+											},
+											{
+												textLeft: pageData.mission.missionPatientInfo,
+											},
+										]
+									: []),
+								...(pageData.mission.missionAdditionalInfo &&
+								pageData.mission.missionAdditionalInfo.length > 0
+									? [
+											{
+												textMid: "Weitere Infos:",
+												style: { fontWeight: "bold" },
+											},
+											{
+												textLeft: pageData.mission.missionAdditionalInfo,
+											},
+										]
+									: []),
 							],
 						});
 						break;