diff --git a/firmware/controllers/map_averaging.cpp b/firmware/controllers/map_averaging.cpp
index 4dd08eb47d..bee2dfe60b 100644
--- a/firmware/controllers/map_averaging.cpp
+++ b/firmware/controllers/map_averaging.cpp
@@ -241,8 +241,8 @@ static void mapAveragingCallback(trigger_event_e ckpEventType,
 		}
 
 		angle_t samplingEnd = samplingStart + samplingDuration;
-		fixAngle(samplingEnd, "samplingEnd");
 		if (!cisnan(samplingEnd)) {
+			fixAngle(samplingEnd, "samplingEnd");
 			// only if value is already prepared
 			int structIndex = getRevolutionCounter() % 2;
 			// todo: schedule this based on closest trigger event, same as ignition works