diff --git a/arangod/Aql/ExecutionBlock.cpp b/arangod/Aql/ExecutionBlock.cpp
index a7dc4bb838..143b5425cc 100644
--- a/arangod/Aql/ExecutionBlock.cpp
+++ b/arangod/Aql/ExecutionBlock.cpp
@@ -70,9 +70,9 @@ void ExecutionBlock::walk (WalkerWorker* worker) {
   // Now handle a subquery:
   if (_exeNode->getType() == ExecutionNode::SUBQUERY) {
     auto p = static_cast<SubqueryBlock*>(this);
-    if (worker->enterSubquery(this, nullptr)) { ; // p->_subquery
+    if (worker->enterSubquery(this, p->getSubquery())) { ;
             p->getSubquery()->walk(worker);
-      worker->leaveSubquery(this, nullptr); // p->_subquery
+            worker->leaveSubquery(this, p->getSubquery());
     }
   }
   worker->after(this);