diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/RefUpdateListener.java b/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/RefUpdateListener.java
index 335b355..eddd2f4 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/RefUpdateListener.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/RefUpdateListener.java
@@ -113,12 +113,9 @@
     try {
       reviewDb = schemaFactory.open();
       try {
-        for (Update u : e.getUpdates()) {
-          if (!u.getRefName().startsWith("refs/changes/")) {
-            continue;
-          }
+        if (e.getRefName().startsWith("refs/changes/")) {
 
-          PatchSet.Id psId = PatchSet.Id.fromRef(u.getRefName());
+          PatchSet.Id psId = PatchSet.Id.fromRef(e.getRefName());
           PatchSet ps = reviewDb.patchSets().get(psId);
           if (ps == null) {
             log.warn("No patch set found for " + u.getRefName());
@@ -127,12 +124,12 @@
 
           final Change change = reviewDb.changes().get(psId.getParentKey());
           if (change == null) {
-            log.warn("No change found for " + u.getRefName());
-            continue;
+            log.warn("No change found for " + e.getRefName());
+            return;
           }
 
           final RevCommit commit =
-              rw.parseCommit(ObjectId.fromString(u.getNewObjectId()));
+              rw.parseCommit(ObjectId.fromString(e.getNewObjectId()));
 
           final Runnable task =
               reviewersByBlameFactory.create(commit, change, ps, maxReviewers, git);
