diff --git a/Script/CastorScript.py b/Script/CastorScript.py
index bb21a7be598588d22bd7a353d8bed8154f28a2c8..984cec986c593dc2ea6e87f47caf47ec049b0a97 100755
--- a/Script/CastorScript.py
+++ b/Script/CastorScript.py
@@ -113,7 +113,8 @@ def main(conf):
                          % str(ex),extra=logInfo)
 
     ##### Start looking for the partition #####
-    check = CheckThread(conf, manager, copy, delete, event, logger, ERS_handler)
+    if conf.ERS_enabled:
+        check = CheckThread(conf, manager, copy, delete, event, logger, ERS_handler)
 
 
     ##### Create db logger #####
@@ -191,7 +192,8 @@ def main(conf):
     manager.start()
     copy.start()
     delete.start()
-    check.start()
+    if conf.ERS_enabled:
+        check.start()
     logInfo = {'file':logger.findCaller()[0],'line':logger.findCaller()[1]}
     logger.info('Manager,Copy, Delete and Check Threads started',extra = logInfo)
     
@@ -255,13 +257,15 @@ def main(conf):
     manager.managerExit()
     copy.copyExit()
     delete.deleteExit()
-    check.checkExit()
+    if conf.ERS_enabled:
+        check.checkExit()
 
     ##### Wait for the threads to finish and then stop #####
     manager.join()
     copy.join()
     delete.join()
-    check.join()
+    if conf.ERS_enabled:
+        check.join()
     logInfo = {'file':logger.findCaller()[0],'line':logger.findCaller()[1]}
     logger.info('Manager,Copy, Delete and Check Threads joined the main thread',extra = logInfo)