diff --git a/firmware/controllers/actuators/boost_control.cpp b/firmware/controllers/actuators/boost_control.cpp
index ce55455f4b..d599695b41 100644
--- a/firmware/controllers/actuators/boost_control.cpp
+++ b/firmware/controllers/actuators/boost_control.cpp
@@ -185,13 +185,15 @@ void initBoostCtrl(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) {
 	if (CONFIG(boostControlPin) == GPIO_UNASSIGNED){
 		return;
 	}
+#endif
 
-	boostControlPid.initPidClass(&persistentState.persistentConfiguration.engineConfiguration.boostPid);
+	boostControlPid.initPidClass(&engineConfiguration->boostPid);
 
 	logger = sharedLogger;
 	boostMapOpen.init(config->boostTableOpenLoop, config->boostMapBins, config->boostRpmBins);
 	boostMapClosed.init(config->boostTableClosedLoop, config->boostTpsBins, config->boostRpmBins);
 	boostControlPid.reset();
+#if !EFI_UNIT_TEST
 	startBoostPin();
 	BoostController.Start();
 #endif
diff --git a/firmware/controllers/actuators/boost_control.h b/firmware/controllers/actuators/boost_control.h
index 9add50cb01..3554f35828 100644
--- a/firmware/controllers/actuators/boost_control.h
+++ b/firmware/controllers/actuators/boost_control.h
@@ -11,7 +11,7 @@
 
 void startBoostPin(void);
 void stopBoostPin(void);
-void initBoostCtrl(Logging *sharedLogger);
+void initBoostCtrl(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX);
 void setBoostPFactor(float p);
 void setBoostIFactor(float i);
 void setBoostDFactor(float d);
diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp
index 1e2bec24c2..b3ad599b3e 100644
--- a/firmware/controllers/engine_controller.cpp
+++ b/firmware/controllers/engine_controller.cpp
@@ -151,6 +151,14 @@ static void mostCommonInitEngineController(Logging *sharedLogger DECLARE_ENGINE_
 	}
 #endif /* EFI_MAP_AVERAGING */
 
+#if EFI_BOOST_CONTROL
+	initBoostCtrl(sharedLogger PASS_ENGINE_PARAMETER_SUFFIX);
+#endif /* EFI_BOOST_CONTROL */
+
+#if EFI_LAUNCH_CONTROL
+	initLaunchControl(sharedLogger PASS_ENGINE_PARAMETER_SUFFIX);
+#endif
+
 }
 
 #if EFI_ENABLE_MOCK_ADC
@@ -676,14 +684,6 @@ void initEngineContoller(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX)
 	initAlternatorCtrl(sharedLogger PASS_ENGINE_PARAMETER_SUFFIX);
 #endif /* EFI_ALTERNATOR_CONTROL */
 
-#if EFI_BOOST_CONTROL
-	initBoostCtrl(sharedLogger PASS_ENGINE_PARAMETER_SUFFIX);
-#endif /* EFI_BOOST_CONTROL */
-
-#if EFI_LAUNCH_CONTROL
-	initLaunchControl(sharedLogger PASS_ENGINE_PARAMETER_SUFFIX);
-#endif
-
 #if EFI_AUX_PID
 	initAuxPid(sharedLogger);
 #endif /* EFI_AUX_PID */