diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.OverlayPool_tf.py b/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.OverlayPool_tf.py
index 38228f4f5a1da1fefa4b7bb0df6dcd6969ed2ba8..13c6f4f9533c1d0fce937bbc79d789ad3640aecd 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.OverlayPool_tf.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.OverlayPool_tf.py
@@ -82,17 +82,17 @@ else:
 
     DetFlags.digitize.LVL1_setOff()
 
-## Tidy up NSW DetFlags: temporary measure
-DetFlags.sTGC_setOff()
-DetFlags.Micromegas_setOff()
-from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags
-if (CommonGeometryFlags.Run() in ["RUN3", "RUN4"]):
-    DetFlags.sTGC_setOn()
-    DetFlags.Micromegas_setOn()
-
-from AtlasGeoModel.MuonGMJobProperties import MuonGeometryFlags
-if not MuonGeometryFlags.hasCSC():
-    DetFlags.CSC_setOff()
+if hasattr(runArgs,"geometryVersion") or not globalflags.DetDescrVersion.isDefault():
+    ## Tidy up NSW DetFlags
+    ## only do this if we can be sure globalflags.DetDescrVersion has been configured.
+    from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags
+    if CommonGeometryFlags.Run() not in ["RUN3", "RUN4"]:
+        DetFlags.sTGC_setOff()
+        DetFlags.Micromegas_setOff()
+
+    from AtlasGeoModel.MuonGMJobProperties import MuonGeometryFlags
+    if not MuonGeometryFlags.hasCSC():
+        DetFlags.CSC_setOff()
 
 DetFlags.Print()
 
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.Overlay_tf.py b/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.Overlay_tf.py
index 81ba3e27855347b1c578db1744c39bc30618ca60..51bfac1f37623a2912acd1eab3486c0252704b12 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.Overlay_tf.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.Overlay_tf.py
@@ -109,17 +109,19 @@ else:
 
     DetFlags.digitize.LVL1_setOff()
 
-## Tidy up NSW DetFlags: temporary measure
-DetFlags.sTGC_setOff()
-DetFlags.Micromegas_setOff()
-from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags
-if (CommonGeometryFlags.Run() in ["RUN3", "RUN4"]):
-    DetFlags.sTGC_setOn()
-    DetFlags.Micromegas_setOn()
-
-from AtlasGeoModel.MuonGMJobProperties import MuonGeometryFlags
-if not MuonGeometryFlags.hasCSC():
-    DetFlags.CSC_setOff()
+if hasattr(runArgs,"geometryVersion") or not globalflags.DetDescrVersion.isDefault():
+    ## Tidy up NSW DetFlags: temporary measure
+    ## only do this if we can be sure globalflags.DetDescrVersion has been configured.
+    DetFlags.sTGC_setOff()
+    DetFlags.Micromegas_setOff()
+    from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags
+    if (CommonGeometryFlags.Run() in ["RUN3", "RUN4"]):
+        DetFlags.sTGC_setOn()
+        DetFlags.Micromegas_setOn()
+
+        from AtlasGeoModel.MuonGMJobProperties import MuonGeometryFlags
+        if not MuonGeometryFlags.hasCSC():
+            DetFlags.CSC_setOff()
 
 # TODO: need to do it better
 #DetFlags.makeRIO.all_setOff() ## Currently has to be on otherwise InDetTRTStrawStatusSummarySvc is not created