diff --git a/apps/dispatch/app/_components/map/MissionMarkers.tsx b/apps/dispatch/app/_components/map/MissionMarkers.tsx
index e8021838..ce2566e0 100644
--- a/apps/dispatch/app/_components/map/MissionMarkers.tsx
+++ b/apps/dispatch/app/_components/map/MissionMarkers.tsx
@@ -172,6 +172,9 @@ const MissionPopupContent = ({
 									addressMissionDestination: mission.addressMissionDestination ?? undefined,
 									addressAdditionalInfo: mission.addressAdditionalInfo ?? undefined,
 									state: "draft",
+									hpgAmbulanceState: "NOT_REQUESTED",
+									hpgFireEngineState: "NOT_REQUESTED",
+									hpgPoliceState: "NOT_REQUESTED",
 									hpgLocationLat: mission.hpgLocationLat ?? undefined,
 									hpgLocationLng: mission.hpgLocationLng ?? undefined,
 								});
diff --git a/apps/dispatch/app/_components/map/_components/MissionMarkerTabs.tsx b/apps/dispatch/app/_components/map/_components/MissionMarkerTabs.tsx
index 4ed99b7e..7fdd1f1a 100644
--- a/apps/dispatch/app/_components/map/_components/MissionMarkerTabs.tsx
+++ b/apps/dispatch/app/_components/map/_components/MissionMarkerTabs.tsx
@@ -114,9 +114,9 @@ const Einsatzdetails = ({
 									setMissionFormValues({
 										...mission,
 										id: undefined,
-										hpgAmbulanceState: null,
-										hpgFireEngineState: null,
-										hpgPoliceState: null,
+										hpgAmbulanceState: "NOT_REQUESTED",
+										hpgFireEngineState: "NOT_REQUESTED",
+										hpgPoliceState: "NOT_REQUESTED",
 										hpgLocationLat: undefined,
 										hpgLocationLng: undefined,
 										state: "draft",
@@ -311,9 +311,9 @@ const Einsatzdetails = ({
 								setMissionFormValues({
 									...mission,
 									id: undefined,
-									hpgAmbulanceState: null,
-									hpgFireEngineState: null,
-									hpgPoliceState: null,
+									hpgAmbulanceState: "NOT_REQUESTED",
+									hpgFireEngineState: "NOT_REQUESTED",
+									hpgPoliceState: "NOT_REQUESTED",
 									hpgLocationLat: undefined,
 									hpgLocationLng: undefined,
 									state: "draft",
diff --git a/apps/dispatch/app/dispatch/_components/pannel/MissionForm.tsx b/apps/dispatch/app/dispatch/_components/pannel/MissionForm.tsx
index 9d37942c..3ff05a03 100644
--- a/apps/dispatch/app/dispatch/_components/pannel/MissionForm.tsx
+++ b/apps/dispatch/app/dispatch/_components/pannel/MissionForm.tsx
@@ -96,9 +96,9 @@ export const MissionForm = () => {
 				missionKeywordAbbreviation: null as any,
 				missionKeywordCategory: null as any,
 				missionKeywordName: null as any,
-				hpgFireEngineState: null,
-				hpgAmbulanceState: null,
-				hpgPoliceState: null,
+				hpgAmbulanceState: "NOT_REQUESTED",
+				hpgFireEngineState: "NOT_REQUESTED",
+				hpgPoliceState: "NOT_REQUESTED",
 				hpgMissionString: null,
 				hpgSelectedMissionString: null,
 				hpg: null,