diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp
index a047d1f06f..246c467f73 100644
--- a/firmware/controllers/algo/engine_configuration.cpp
+++ b/firmware/controllers/algo/engine_configuration.cpp
@@ -1181,7 +1181,9 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
 	// set initial pin groups
 	setDefaultBasePins(PASS_CONFIG_PARAMETER_SIGNATURE);
 
-	boardCallback(engineConfiguration);
+	if (boardCallback != nullptr) {
+		boardCallback(engineConfiguration);
+	}
 
 #if EFI_PROD_CODE
 	// call overrided board-specific configuration setup, if needed (for custom boards only)
diff --git a/unit_tests/tests/test_hardware_reinit.cpp b/unit_tests/tests/test_hardware_reinit.cpp
index 5aee8257ce..8c08644020 100644
--- a/unit_tests/tests/test_hardware_reinit.cpp
+++ b/unit_tests/tests/test_hardware_reinit.cpp
@@ -12,6 +12,6 @@ TEST(hardware, reinit) {
 	ButtonDebounce::startConfigurationList();
 
 
-//	resetConfigurationExt(nullptr, nullptr, ROVER_V8 PASS_ENGINE_PARAMETER_SUFFIX);
-//	resetConfigurationExt(nullptr, nullptr, MIATA_NA6_MAP PASS_ENGINE_PARAMETER_SUFFIX);
+	resetConfigurationExt(nullptr, nullptr, ROVER_V8 PASS_ENGINE_PARAMETER_SUFFIX);
+	resetConfigurationExt(nullptr, nullptr, MIATA_NA6_MAP PASS_ENGINE_PARAMETER_SUFFIX);
 }