diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
index c84cea5362..1d3ffc1c55 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
@@ -201,10 +201,6 @@ public class ChangeInserter {
 
     if(!messageIsForChange()) {
       commitMessageNotForChange();
-      if (changeMessage != null) {
-        ChangeUtil.bumpRowVersionNotLastUpdatedOn(
-            changeMessage.getKey().getParentKey(), db);
-      }
     }
     gitRefUpdated.fire(change.getProject(), patchSet.getRefName(),
         ObjectId.zeroId(), commit);
@@ -236,6 +232,8 @@ public class ChangeInserter {
     if (changeMessage != null) {
       Change otherChange =
           db.changes().get(changeMessage.getPatchSetId().getParentKey());
+      ChangeUtil.bumpRowVersionNotLastUpdatedOn(
+          changeMessage.getKey().getParentKey(), db);
       ChangeControl otherControl =
           refControl.getProjectControl().controlFor(otherChange);
       ChangeUpdate updateForOtherChange =