diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PatchSetInserter.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PatchSetInserter.java
index 7156cc6580..8317859322 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PatchSetInserter.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PatchSetInserter.java
@@ -209,15 +209,15 @@ public class PatchSetInserter {
       }
 
       final List<FooterLine> footerLines = commit.getFooterLines();
-      ChangeUtil.updateTrackingIds(db, change, trackingFooters, footerLines);
+      ChangeUtil.updateTrackingIds(db, updatedChange, trackingFooters, footerLines);
       db.commit();
 
       if (changeMessage != null) {
         db.changeMessages().insert(Collections.singleton(changeMessage));
       }
 
-      indexer.index(change);
-      hooks.doPatchsetCreatedHook(change, patchSet, db);
+      indexer.index(updatedChange);
+      hooks.doPatchsetCreatedHook(updatedChange, patchSet, db);
     } finally {
       db.rollback();
     }