diff --git a/frontend/src/features/missions/MissionForm/hooks/useUpdateMissionZone.ts b/frontend/src/features/missions/MissionForm/hooks/useUpdateMissionZone.ts
index 6b160ff47..7b2337f2f 100644
--- a/frontend/src/features/missions/MissionForm/hooks/useUpdateMissionZone.ts
+++ b/frontend/src/features/missions/MissionForm/hooks/useUpdateMissionZone.ts
@@ -37,7 +37,16 @@ export const useUpdateMissionZone = (sortedActions: Array<ActionsTypeForTimeLine
   )
 
   const firstAction = filteredEnvActions[0]
-  const firstActionWithDate = firstAction?.actionStartDateTimeUtc ? firstAction : undefined
+  const firstActionWithDate = useMemo(() => {
+    if (firstAction?.actionType === ActionTypeEnum.SURVEILLANCE) {
+      return firstAction?.actionStartDateTimeUtc ? firstAction : undefined
+    }
+    if (firstAction?.actionType === ActionTypeEnum.CONTROL) {
+      return firstAction?.actionEndDateTimeUtc ? firstAction : undefined
+    }
+
+    return undefined
+  }, [firstAction])
 
   const listener = useAppSelector(state => state.draw.listener)
   const { setFieldValue, values } = useFormikContext<Mission>()