diff --git a/go/vt/vttablet/tabletserver/repltracker/writer.go b/go/vt/vttablet/tabletserver/repltracker/writer.go
index 11492fa92e4..c5173e1ec5a 100644
--- a/go/vt/vttablet/tabletserver/repltracker/writer.go
+++ b/go/vt/vttablet/tabletserver/repltracker/writer.go
@@ -98,15 +98,15 @@ func newHeartbeatWriter(env tabletenv.Env, alias *topodatapb.TabletAlias) *heart
 	configType := HeartbeatConfigTypeNone
 	onDemandDuration := defaultOnDemandDuration
 	switch {
+	case config.ReplicationTracker.Mode == tabletenv.Heartbeat:
+		configType = HeartbeatConfigTypeAlways
+		onDemandDuration = 0
 	case config.ReplicationTracker.HeartbeatOnDemand > 0:
 		configType = HeartbeatConfigTypeOnDemand
 		onDemandDuration = config.ReplicationTracker.HeartbeatOnDemand
 		if onDemandDuration < minimalOnDemandDuration {
 			onDemandDuration = minimalOnDemandDuration
 		}
-	case config.ReplicationTracker.Mode == tabletenv.Heartbeat:
-		configType = HeartbeatConfigTypeAlways
-		onDemandDuration = 0
 	}
 	heartbeatInterval := config.ReplicationTracker.HeartbeatInterval
 	if heartbeatInterval == 0 {