diff --git a/src/DIRAC/FrameworkSystem/Agent/ComponentSupervisionAgent.py b/src/DIRAC/FrameworkSystem/Agent/ComponentSupervisionAgent.py
index 89505750154..8d67642b8d8 100644
--- a/src/DIRAC/FrameworkSystem/Agent/ComponentSupervisionAgent.py
+++ b/src/DIRAC/FrameworkSystem/Agent/ComponentSupervisionAgent.py
@@ -121,7 +121,7 @@ def logError(self, errStr, varMsg=""):
 
     def beginExecution(self):
         """Reload the configurations before every cycle."""
-        self.setup = self.am_getOption("Setup", self.setup)
+        self.setup = gConfig.getValue("/DIRAC/Setup", self.setup)
         self.enabled = self.am_getOption("EnableFlag", self.enabled)
         self.restartAgents = self.am_getOption("RestartAgents", self.restartAgents)
         self.restartExecutors = self.am_getOption("RestartExecutors", self.restartExecutors)
diff --git a/src/DIRAC/FrameworkSystem/Agent/test/Test_ComponentSupervisionAgent.py b/src/DIRAC/FrameworkSystem/Agent/test/Test_ComponentSupervisionAgent.py
index 9be8e3ef046..069139b4df5 100644
--- a/src/DIRAC/FrameworkSystem/Agent/test/Test_ComponentSupervisionAgent.py
+++ b/src/DIRAC/FrameworkSystem/Agent/test/Test_ComponentSupervisionAgent.py
@@ -84,7 +84,6 @@ def test_begin_execution(self):
         self.restartAgent.accounting["Junk"]["Funk"] = 1
         self.restartAgent.am_getOption = MagicMock()
         getOptionCalls = [
-            call("Setup", self.restartAgent.setup),
             call("EnableFlag", True),
             call("MailTo", self.restartAgent.addressTo),
             call("MailFrom", self.restartAgent.addressFrom),
diff --git a/src/DIRAC/FrameworkSystem/ConfigTemplate.cfg b/src/DIRAC/FrameworkSystem/ConfigTemplate.cfg
index 5a2ff523282..99cc2aa2a2b 100644
--- a/src/DIRAC/FrameworkSystem/ConfigTemplate.cfg
+++ b/src/DIRAC/FrameworkSystem/ConfigTemplate.cfg
@@ -208,8 +208,6 @@ Agents
     PollingTime = 600
     # Overall enable or disable
     EnableFlag = False
-    # Which setup to monitor
-    Setup = DIRAC-Production
     # Email addresses receiving notifications
     MailTo =
     # Sender email address