diff --git a/firmware/controllers/trigger/spark_logic.cpp b/firmware/controllers/trigger/spark_logic.cpp
index d7f99964ca..13af20a074 100644
--- a/firmware/controllers/trigger/spark_logic.cpp
+++ b/firmware/controllers/trigger/spark_logic.cpp
@@ -173,6 +173,7 @@ static ALWAYS_INLINE void handleSparkEvent(bool limitedSpark, uint32_t trgEventI
 	 * TODO: improve precision
 	 */
 	efiAssertVoid(!cisnan(iEvent->advance), "findAngle#4");
+	assertAngleRange(iEvent->advance, "findAngle#a5");
 	TRIGGER_SHAPE(findTriggerPosition(&iEvent->sparkPosition, iEvent->advance PASS_ENGINE_PARAMETER_SUFFIX));
 
 #if EFI_UNIT_TEST || defined(__DOXYGEN__)
@@ -247,6 +248,7 @@ void prepareIgnitionSchedule(IgnitionEvent *event DECLARE_ENGINE_PARAMETER_SUFFI
 
 	angle_t a = localAdvance - dwellAngle;
 	efiAssertVoid(!cisnan(a), "findAngle#5");
+	assertAngleRange(a, "findAngle#a6");
 	TRIGGER_SHAPE(findTriggerPosition(&event->dwellPosition, a PASS_ENGINE_PARAMETER_SUFFIX));
 
 #if FUEL_MATH_EXTREME_LOGGING || defined(__DOXYGEN__)