diff --git a/libs/temporal/tempo.cc b/libs/temporal/tempo.cc
index c7bfe6d612..70bdfd9137 100644
--- a/libs/temporal/tempo.cc
+++ b/libs/temporal/tempo.cc
@@ -1121,6 +1121,12 @@ TempoMap::change_tempo (TempoPoint & p, Tempo const & t)
 void
 TempoMap::replace_tempo (TempoPoint const & old, Tempo const & t, timepos_t const & time)
 {
+	if (old.sclock() == 0) {
+		_tempos.front() = t;
+		reset_starting_at (0);
+		return;
+	}
+
 	remove_tempo (old, false);
 	set_tempo (t, time);
 }