diff --git a/src/engraving/dom/score.cpp b/src/engraving/dom/score.cpp
index 417d088ed88bc..40fd1f766ecd5 100644
--- a/src/engraving/dom/score.cpp
+++ b/src/engraving/dom/score.cpp
@@ -579,15 +579,16 @@ void Score::rebuildTempoAndTimeSigMaps(Measure* measure, std::optional<BeatsPerS
                     }
                 }
             }
-            if (!RealIsNull(stretch) && !RealIsNull(stretch)) {
+
+            if (!RealIsNull(stretch) && !RealIsEqual(stretch, 1.0)) {
                 BeatsPerSecond otempo = tempomap()->tempo(segment.tick().ticks());
                 BeatsPerSecond ntempo = otempo.val / stretch;
                 tempomap()->setTempo(segment.tick().ticks(), ntempo);
 
                 Fraction currentSegmentEndTick;
 
-                if (segment.next1()) {
-                    currentSegmentEndTick = segment.next1()->tick();
+                if (const Segment* nextActiveSegment = segment.nextActive()) {
+                    currentSegmentEndTick = nextActiveSegment->tick();
                 } else {
                     currentSegmentEndTick = segment.tick() + segment.ticks();
                 }