diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java
index c2618f5b55..be05ea69e3 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java
@@ -1823,6 +1823,7 @@ public class ChangeIT extends AbstractDaemonTest {
           @Override
           public String onSubmit(String newCommitMessage, RevCommit original,
               RevCommit mergeTip, Branch.NameKey destination) {
+            assertThat(original.getName()).isNotEqualTo(mergeTip.getName());
             return newCommitMessage + "Custom: " + destination.get();
           }
         });
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
index 680234ce93..d480df9860 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
@@ -1112,7 +1112,7 @@ public class ChangeJson {
           out.commit = toCommit(ctl, rw, commit, has(WEB_LINKS), fillCommit);
         }
         if (addFooters) {
-          Ref ref = repo.exactRef(in.getRefName());
+          Ref ref = repo.exactRef(ctl.getChange().getDest().get());
           RevCommit mergeTip = null;
           if (ref != null){
             mergeTip = rw.parseCommit(ref.getObjectId());