diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
index 7e130a5acb..4f2a4abb2b 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
@@ -1192,9 +1192,11 @@ public class ReceiveCommits implements PreReceiveHook, PostReceiveHook {
       final Ref mergedInto = findMergedInto(change.getDest().get(), c);
       result.mergedIntoRef = mergedInto != null ? mergedInto.getName() : null;
     }
+    final PatchSetInfo info = patchSetInfoFactory.get(c, ps.getId());
+    change.setCurrentPatchSet(info);
     result.change = change;
     result.patchSet = ps;
-    result.info = patchSetInfoFactory.get(c, ps.getId());
+    result.info = info;
 
     final Account.Id authorId =
         result.info.getAuthor() != null ? result.info.getAuthor().getAccount()