diff --git a/src/main/java/com/googlesource/gerrit/modules/gitrefsfilter/ForProjectWrapper.java b/src/main/java/com/googlesource/gerrit/modules/gitrefsfilter/ForProjectWrapper.java
index 7d9df89..6136498 100644
--- a/src/main/java/com/googlesource/gerrit/modules/gitrefsfilter/ForProjectWrapper.java
+++ b/src/main/java/com/googlesource/gerrit/modules/gitrefsfilter/ForProjectWrapper.java
@@ -79,7 +79,7 @@
         .filter(
             (ref) -> {
               String refName = ref.getName();
-              return (!isChangeRef(refName) || (!isChangeMetaRef(refName) && isOpen(refName)));
+              return (!isChangeRef(refName) || (!isChangeMetaRef(refName) && isOpen(repo, refName)));
             })
         .collect(Collectors.toList());
   }
@@ -92,10 +92,10 @@
     return isChangeRef(changeKey) && changeKey.endsWith("/meta");
   }
 
-  private boolean isOpen(String refName) {
+  private boolean isOpen(Repository repo, String refName) {
     try {
       Change.Id changeId = Change.Id.fromRef(refName);
-      ChangeNotes changeNotes = changeNotesFactory.create(project, changeId);
+      ChangeNotes changeNotes = changeNotesFactory.create(repo, project, changeId);
       return changeNotes.getChange().getStatus().isOpen();
     } catch (NoSuchChangeException e) {
       logger.atWarning().withCause(e).log(
