diff --git a/go/logic/migrator.go b/go/logic/migrator.go
index 492133a64..2b44d74aa 100644
--- a/go/logic/migrator.go
+++ b/go/logic/migrator.go
@@ -392,6 +392,7 @@ func (this *Migrator) createFlagFiles() (err error) {
 func (this *Migrator) Migrate() (err error) {
 	this.migrationContext.Log.Infof("Migrating %s.%s", sql.EscapeName(this.migrationContext.DatabaseName), sql.EscapeName(this.migrationContext.OriginalTableName))
 	this.migrationContext.StartTime = time.Now()
+	this.migrationContext.SetLastHeartbeatOnChangelogTime(this.migrationContext.StartTime)
 	if this.migrationContext.Hostname, err = os.Hostname(); err != nil {
 		return err
 	}
@@ -588,6 +589,7 @@ func (this *Migrator) Revert() error {
 		sql.EscapeName(this.migrationContext.DatabaseName), sql.EscapeName(this.migrationContext.OriginalTableName),
 		sql.EscapeName(this.migrationContext.DatabaseName), sql.EscapeName(this.migrationContext.OldTableName))
 	this.migrationContext.StartTime = time.Now()
+	this.migrationContext.SetLastHeartbeatOnChangelogTime(this.migrationContext.StartTime)
 	var err error
 	if this.migrationContext.Hostname, err = os.Hostname(); err != nil {
 		return err
diff --git a/go/logic/migrator_test.go b/go/logic/migrator_test.go
index 3d3b085a9..91acd0623 100644
--- a/go/logic/migrator_test.go
+++ b/go/logic/migrator_test.go
@@ -817,6 +817,7 @@ func (suite *MigratorTestSuite) TestRevertEmpty() {
 		err = migrator.Migrate()
 		oldTableName = migrationContext.GetOldTableName()
 		suite.Require().NoError(err)
+		suite.Require().Less(migrationContext.TimeSinceLastHeartbeatOnChangelog(), 24*time.Hour)
 	}
 
 	// revert the original migration
@@ -835,6 +836,7 @@ func (suite *MigratorTestSuite) TestRevertEmpty() {
 
 		err = migrator.Revert()
 		suite.Require().NoError(err)
+		suite.Require().Less(migrationContext.TimeSinceLastHeartbeatOnChangelog(), 24*time.Hour)
 	}
 }