diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Services/python/iGeant4.py b/Simulation/ISF/ISF_Geant4/ISF_Geant4Services/python/iGeant4.py
index 92a7a22bd1d921f6f0eb871f24909e949a8fab5a..85fb00e8f882aa396a4da10602b2712aa442c3ea 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Services/python/iGeant4.py
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Services/python/iGeant4.py
@@ -44,13 +44,6 @@ class iGeant4:
     svcMgr += Geant4SimService
     self.__simSvc__ = Geant4SimService
 
-    ##FIXME: ISF_ParticleFinalStateFilter is configured in
-    ##ISF_HepMC_ToolsConfig.py and is only used by ISF_StackFiller
-    ##which is also configured in ISF_HepMC_ToolsConfig.py.
-    finalStateFilter = getPublicTool("ISF_ParticleFinalStateFilter")
-    finalStateFilter.CheckGenSimStable = False
-    finalStateFilter.CheckGenInteracting = False
-
     ####################################
     ##
     ## the G4 Python part:
diff --git a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/python/ISF_HepMC_ToolsConfig.py b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/python/ISF_HepMC_ToolsConfig.py
index 0fcf1910cc877ec6b8d495f70358f2d7b15a1d0a..6ac2bfbfc6d5be1dfc47aee8f81de058f15a50ff 100644
--- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/python/ISF_HepMC_ToolsConfig.py
+++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/python/ISF_HepMC_ToolsConfig.py
@@ -13,9 +13,13 @@ from AthenaCommon.SystemOfUnits import MeV, mm
 ## GenParticleFilters
 
 def getParticleFinalStateFilter(name="ISF_ParticleFinalStateFilter", **kwargs):
-    # ParticleFinalStateFilter
+    from ISF_Config.ISF_jobProperties import ISF_Flags
+    G4NotInUse = not ISF_Flags.UsingGeant4.get_Value()
+    from G4AtlasApps.SimFlags import simFlags
+    G4NotInUse = G4NotInUse and simFlags.ISFRun.get_Value()
     # use CheckGenInteracting==False to allow GenEvent neutrinos to propagate into the simulation
-    #kwargs.setdefault("CheckGenInteracting"     , False )
+    kwargs.setdefault("CheckGenSimStable", G4NotInUse)
+    kwargs.setdefault("CheckGenInteracting", G4NotInUse)
     return CfgMgr.ISF__GenParticleFinalStateFilter(name, **kwargs)
 
 def getParticleSimWhiteList(name="ISF_ParticleSimWhiteList", **kwargs):