diff --git a/app/src/molecules/InterventionModal/DeckMapContent.tsx b/app/src/molecules/InterventionModal/DeckMapContent.tsx
index c3b0822b883..a45bc920e0a 100644
--- a/app/src/molecules/InterventionModal/DeckMapContent.tsx
+++ b/app/src/molecules/InterventionModal/DeckMapContent.tsx
@@ -108,7 +108,7 @@ function DeckConfigStyleDeckMapContent({
     'default'
   )
   React.useEffect(() => {
-    setSelectedLocation(selectedLocation)
+    setSelectedLocation != null && setSelectedLocation(selectedLocation)
   }, [selectedLocation, setSelectedLocation])
   return <>{DeckLocationSelect}</>
 }