diff --git a/src/main/java/com/googlesource/gerrit/plugins/task/TaskPluginDefinedInfoFactory.java b/src/main/java/com/googlesource/gerrit/plugins/task/TaskPluginDefinedInfoFactory.java
index 0791bda..700b3e2 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/task/TaskPluginDefinedInfoFactory.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/task/TaskPluginDefinedInfoFactory.java
@@ -243,6 +243,10 @@
               attribute.path = MISSING_VIEW_PATH_CAPABILITY;
             }
           }
+          if (node.isChange()) {
+            node.getNodeSetByBaseTasksFactory().get(task.subSection).add(node.key());
+          }
+
           boolean groupApplicable = attribute.status != null;
 
           if (groupApplicable || !options.onlyApplicable) {
@@ -264,9 +268,6 @@
                 attribute.evaluationMilliSeconds = millis() - attribute.evaluationMilliSeconds;
               }
               addStatistics(attribute.statistics);
-              if (node.isChange()) {
-                node.getNodeSetByBaseTasksFactory().get(task.subSection).add(node.key());
-              }
               return Optional.of(attribute);
             }
           }