diff --git a/firmware/config/boards/ST_STM32F4/board.c b/firmware/config/boards/ST_STM32F4/board.c
index b15f1e5f29..ebab7df998 100644
--- a/firmware/config/boards/ST_STM32F4/board.c
+++ b/firmware/config/boards/ST_STM32F4/board.c
@@ -129,8 +129,8 @@ void boardInit(void) {
 }
 
 /**
- * @brief   Board-specific configuration code.
+ * @brief   Board-specific configuration code overrides.
  * @todo    Add your board-specific code, if any.
  */
-void setBoardConfiguration(void) {
+void setBoardConfigurationOverrides(void) {
 }
diff --git a/firmware/config/boards/ST_STM32F4/board.h b/firmware/config/boards/ST_STM32F4/board.h
index b2b7631f76..abff6dfcad 100644
--- a/firmware/config/boards/ST_STM32F4/board.h
+++ b/firmware/config/boards/ST_STM32F4/board.h
@@ -1342,7 +1342,7 @@
 extern "C" {
 #endif
   void boardInit(void);
-  void setBoardConfiguration(void);
+  void setBoardConfigurationOverrides(void);
 #ifdef __cplusplus
 }
 #endif
diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp
index 3ebe70a62d..9db0fb827a 100644
--- a/firmware/controllers/algo/engine_configuration.cpp
+++ b/firmware/controllers/algo/engine_configuration.cpp
@@ -34,6 +34,7 @@
 #include "idle_thread.h"
 #include "alternatorController.h"
 #include "hardware.h"
+#include "board.h"
 #endif /* EFI_PROD_CODE */
 
 #include "hip9011_lookup.h"
@@ -89,8 +90,6 @@
 #include "zil130.h"
 #include "honda_600.h"
 
-#include "board.h"
-
 EXTERN_ENGINE;
 
 #if EFI_TUNER_STUDIO || defined(__DOXYGEN__)
@@ -868,9 +867,11 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
 
 	engineConfiguration->tpsAccelLength = 12;
 	engineConfiguration->tpsAccelEnrichmentThreshold = 40; // TPS % change, per engine cycle
-	
+
+#if EFI_PROD_CODE || defined(__DOXYGEN__)
 	// call overrided board-specific configuration setup, if needed (for custom boards only)
-	setBoardConfiguration();
+	setBoardConfigurationOverrides();
+#endif
 }
 
 void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_ENGINE_PARAMETER_S) {