diff --git a/cmd/root.go b/cmd/root.go
index decd9a204..c85d11b68 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -195,11 +195,6 @@ func runRoot(cmd *cobra.Command, args []string) {
 		}
 	}
 
-	// setup modbus proxy
-	if err == nil {
-		err = wrapErrorWithClass(ClassModbusProxy, configureModbusProxy(&conf.ModbusProxy))
-	}
-
 	// setup site and loadpoints
 	var site *core.Site
 	if err == nil {
diff --git a/cmd/setup.go b/cmd/setup.go
index 78c3bbbde..1312823e9 100644
--- a/cmd/setup.go
+++ b/cmd/setup.go
@@ -549,6 +549,11 @@ func configureEnvironment(cmd *cobra.Command, conf *globalconfig.All) error {
 		err = wrapErrorWithClass(ClassEEBus, configureEEBus(&conf.EEBus))
 	}
 
+	// setup modbus proxy
+	if err == nil {
+		err = wrapErrorWithClass(ClassModbusProxy, configureModbusProxy(&conf.ModbusProxy))
+	}
+
 	// setup javascript VMs
 	if err == nil {
 		err = wrapErrorWithClass(ClassJavascript, configureJavascript(conf.Javascript))