diff --git a/js/server/modules/org/arangodb/aql-helper.js b/js/server/modules/org/arangodb/aql-helper.js
index 74db6db06b..453896fc28 100644
--- a/js/server/modules/org/arangodb/aql-helper.js
+++ b/js/server/modules/org/arangodb/aql-helper.js
@@ -432,6 +432,10 @@ function findExecutionNodes(plan, nodetype) {
 
             matches.push(node);
         }
+        else if (node.type === "SubqueryNode") {
+            var subPlan = {"plan" : node.subquery};
+            matches = matches.concat(findExecutionNodes(subPlan, nodetype));
+        }
     });
     return matches;
 }