diff --git a/HLT/Trigger/TrigControl/TrigCommon/bin/athenaHLT.py b/HLT/Trigger/TrigControl/TrigCommon/bin/athenaHLT.py
index 4a9ad45ee0846b845559ca1dc50bdae2679d7164..a28bd028ba030517f2c7c8c299ff34a4c0ed5815 100755
--- a/HLT/Trigger/TrigControl/TrigCommon/bin/athenaHLT.py
+++ b/HLT/Trigger/TrigControl/TrigCommon/bin/athenaHLT.py
@@ -340,6 +340,10 @@ def main():
    # Modify pre/postcommands if necessary
    update_pcommands(args, cdict)
 
+   # Tell the PSC if we are in interactive mode (relevant for state machine)
+   import TrigPSC.PscConfig
+   TrigPSC.PscConfig.interactive = args.interactive
+
    # Run HLTMPPU
    from HLTMPPy.runner import runHLTMPPy
    runHLTMPPy(cdict)
diff --git a/HLT/Trigger/TrigControl/TrigPSC/share/TrigPSCPythonDbSetup.py b/HLT/Trigger/TrigControl/TrigPSC/share/TrigPSCPythonDbSetup.py
index e56abfb74e7164b8344e1665adad9a266ef2e614..201aa3396d485284ef1839b12c13dd054f53638f 100644
--- a/HLT/Trigger/TrigControl/TrigPSC/share/TrigPSCPythonDbSetup.py
+++ b/HLT/Trigger/TrigControl/TrigPSC/share/TrigPSCPythonDbSetup.py
@@ -59,10 +59,6 @@ if not _Conf.useOnlineTHistSvc:
    isvcMgr.declareSvcType("THistSvc","THistSvc")
    setTHistSvcOutput()
 
-if 'interactive' in dir():   
-   PscConfig.interactive = bool(interactive)
-   del interactive
-   
 ## Some cleanup
 del _Conf
 del logLevel
diff --git a/HLT/Trigger/TrigControl/TrigPSC/share/TrigPSCPythonSetup.py b/HLT/Trigger/TrigControl/TrigPSC/share/TrigPSCPythonSetup.py
index c4bb4dedbbd8c087d3e48297a9eb4194376f9e07..a74a7961141b4f7295215a9eddb9b6e6bf6a362c 100755
--- a/HLT/Trigger/TrigControl/TrigPSC/share/TrigPSCPythonSetup.py
+++ b/HLT/Trigger/TrigControl/TrigPSC/share/TrigPSCPythonSetup.py
@@ -144,11 +144,6 @@ else:
          sys.exit( theApp._exitstate )      
       raise
 
-   if 'interactive' in dir():   
-      import TrigPSC.PscConfig 
-      TrigPSC.PscConfig.interactive = bool(interactive)
-      del interactive
-      
    ### run user jobOptions file -------------------------------------------------
    try:
       include( "%s" % PscConfig.optmap['JOBOPTIONSPATH'] )