diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp
index 94e0cb76a9..e059ccecac 100644
--- a/firmware/controllers/algo/engine_configuration.cpp
+++ b/firmware/controllers/algo/engine_configuration.cpp
@@ -174,7 +174,7 @@ void incrementGlobalConfigurationVersion(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 #endif /* EFI_IDLE_CONTROL */
 
 #if EFI_SHAFT_POSITION_INPUT || defined(__DOXYGEN__)
-	onConfigurationChangeTriggerCallback(&activeConfiguration);
+	onConfigurationChangeTriggerCallback(&activeConfiguration PASS_ENGINE_PARAMETER_SUFFIX);
 #endif /* EFI_SHAFT_POSITION_INPUT */
 #if EFI_EMULATE_POSITION_SENSORS || defined(__DOXYGEN__)
 	onConfigurationChangeRpmEmulatorCallback(&activeConfiguration);
diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp
index d30ff0b58b..989f43df03 100644
--- a/firmware/controllers/trigger/trigger_central.cpp
+++ b/firmware/controllers/trigger/trigger_central.cpp
@@ -83,12 +83,13 @@ uint32_t triggerMaxDuration = 0;
 static bool isInsideTriggerHandler = false;
 
 /**
- * true if most recent configuration change has changed any of the trigger settings
+ * true if a recent configuration change has changed any of the trigger settings which
+ * we have not adjusted for yet
  */
 static bool isTriggerConfigChanged = false;
 
-efitick_t previousVvtCamTime = 0;
-efitick_t previousVvtCamDuration = 0;
+static efitick_t previousVvtCamTime = 0;
+static efitick_t previousVvtCamDuration = 0;
 
 void hwHandleVvtCamSignal(trigger_value_e front) {
 	if (ENGINE(isEngineChartEnabled)) {
@@ -555,9 +556,8 @@ static void resetRunningTriggerCounters() {
 
 #define COMPARE_CONFIG_PARAMS(param) (engineConfiguration->param != previousConfiguration->param)
 
-void onConfigurationChangeTriggerCallback(engine_configuration_s *previousConfiguration) {
-#if EFI_PROD_CODE || EFI_SIMULATOR || defined(__DOXYGEN__)
-	isTriggerConfigChanged = COMPARE_CONFIG_PARAMS(trigger.type) ||
+void onConfigurationChangeTriggerCallback(engine_configuration_s *previousConfiguration DECLARE_ENGINE_PARAMETER_SUFFIX) {
+	bool changedNow = COMPARE_CONFIG_PARAMS(trigger.type) ||
 		COMPARE_CONFIG_PARAMS(operationMode) ||
 		COMPARE_CONFIG_PARAMS(useOnlyRisingEdgeForTrigger) ||
 		COMPARE_CONFIG_PARAMS(globalTriggerAngleOffset) ||
@@ -574,7 +574,7 @@ void onConfigurationChangeTriggerCallback(engine_configuration_s *previousConfig
 		COMPARE_CONFIG_PARAMS(bc.nb2ratioFrom) ||
 		COMPARE_CONFIG_PARAMS(bc.nb2ratioTo) ||
 		COMPARE_CONFIG_PARAMS(nbVvtIndex);
-#endif /* EFI_PROD_CODE */
+	isTriggerConfigChanged = isTriggerConfigChanged || changedNow;
 }
 
 /**
diff --git a/firmware/controllers/trigger/trigger_central.h b/firmware/controllers/trigger/trigger_central.h
index 6fe08a29df..ac5d4845b8 100644
--- a/firmware/controllers/trigger/trigger_central.h
+++ b/firmware/controllers/trigger/trigger_central.h
@@ -63,7 +63,7 @@ void addTriggerEventListener(ShaftPositionListener handler, const char *name, En
 int isSignalDecoderError(void);
 void resetMaxValues();
 
-void onConfigurationChangeTriggerCallback(engine_configuration_s *previousConfiguration);
+void onConfigurationChangeTriggerCallback(engine_configuration_s *previousConfiguration DECLARE_ENGINE_PARAMETER_SUFFIX);
 bool checkIfTriggerConfigChanged(void);
 
 #endif /* TRIGGER_CENTRAL_H_ */