diff --git a/firmware/controllers/trigger/decoders/trigger_chrysler.cpp b/firmware/controllers/trigger/decoders/trigger_chrysler.cpp
index 98613487c0..7ac04595f6 100644
--- a/firmware/controllers/trigger/decoders/trigger_chrysler.cpp
+++ b/firmware/controllers/trigger/decoders/trigger_chrysler.cpp
@@ -22,7 +22,6 @@ void initDodgeRam(TriggerWaveform *s) {
 	addSkippedToothTriggerEvents(T_SECONDARY, s, 8, 0, 0.06, 360 - 25, 360, 0, 720);
 
 	s->addEvent720(720, T_PRIMARY, TV_FALL);
-	s->useOnlyPrimaryForSync = true;
 }
 
 void configureNeon2003TriggerWaveformCrank(TriggerWaveform *s DECLARE_ENGINE_PARAMETER_SUFFIX) {
diff --git a/firmware/controllers/trigger/decoders/trigger_honda.cpp b/firmware/controllers/trigger/decoders/trigger_honda.cpp
index f15acc45cf..42d0d47e22 100644
--- a/firmware/controllers/trigger/decoders/trigger_honda.cpp
+++ b/firmware/controllers/trigger/decoders/trigger_honda.cpp
@@ -94,7 +94,6 @@ void configureHondaAccordCDDip(TriggerWaveform *s) {
 	s->addEvent720(720.0f, T_SECONDARY, TV_RISE);
 
 	s->isSynchronizationNeeded = false;
-	s->useOnlyPrimaryForSync = true;
 }
 
 /**
@@ -233,8 +232,6 @@ void configureHondaAccordShifted(TriggerWaveform *s) {
 	}
 
 
-
-	s->useOnlyPrimaryForSync = true;
 	s->isSynchronizationNeeded = false;
 }
 
@@ -254,7 +251,6 @@ void configureOnePlus16(TriggerWaveform *s) {
 	}
 
 	s->isSynchronizationNeeded = false;
-	s->useOnlyPrimaryForSync = true;
 }
 
 // TT_HONDA_K_12_1
diff --git a/firmware/controllers/trigger/decoders/trigger_mazda.cpp b/firmware/controllers/trigger/decoders/trigger_mazda.cpp
index 9b6b9d8448..f455686df7 100644
--- a/firmware/controllers/trigger/decoders/trigger_mazda.cpp
+++ b/firmware/controllers/trigger/decoders/trigger_mazda.cpp
@@ -150,8 +150,6 @@ void configureMazdaProtegeSOHC(TriggerWaveform *s) {
 
 void configureMazdaProtegeLx(TriggerWaveform *s) {
 	s->initialize(FOUR_STROKE_CAM_SENSOR);
-	s->useOnlyPrimaryForSync = true;
-
 	/**
 	 * based on https://svn.code.sf.net/p/rusefi/code/trunk/misc/logs/1993_escort_gt/MAIN_rfi_report_2015-02-01%2017_39.csv
 	 */
diff --git a/firmware/controllers/trigger/decoders/trigger_mitsubishi.cpp b/firmware/controllers/trigger/decoders/trigger_mitsubishi.cpp
index 2a5687441d..f6217bfc46 100644
--- a/firmware/controllers/trigger/decoders/trigger_mitsubishi.cpp
+++ b/firmware/controllers/trigger/decoders/trigger_mitsubishi.cpp
@@ -25,7 +25,6 @@ void configureFordAspireTriggerWaveform(TriggerWaveform * s) {
 	s->addEvent720(x + 360 + y, T_SECONDARY, TV_RISE);
 	s->addEvent720(x + 540, T_SECONDARY, TV_FALL);
 	s->addEvent720(720, T_PRIMARY, TV_FALL);
-	s->useOnlyPrimaryForSync = true;
 }
 
 /**
diff --git a/firmware/controllers/trigger/decoders/trigger_structure.cpp b/firmware/controllers/trigger/decoders/trigger_structure.cpp
index 38e6cb0d8d..d0e869e2f9 100644
--- a/firmware/controllers/trigger/decoders/trigger_structure.cpp
+++ b/firmware/controllers/trigger/decoders/trigger_structure.cpp
@@ -199,6 +199,9 @@ void TriggerWaveform::calculateExpectedEventCounts(bool useOnlyRisingEdgeForTrig
 	if (!shapeWithoutTdc && isSingleToothOnPrimaryChannel != !isSynchronizationNeeded) {
 		firmwareError(ERROR_TRIGGER_DRAMA, "trigger sync constraint violation");
 	}
+	if (isSingleToothOnPrimaryChannel) {
+		useOnlyPrimaryForSync = true;
+	}
 
 // todo: move the following logic from below here
 	//	if (!useOnlyRisingEdgeForTrigger || stateParam == TV_RISE) {