diff --git a/arangod/Aql/SharedQueryState.cpp b/arangod/Aql/SharedQueryState.cpp
index 46e699d5a7..6dc9c5ab33 100644
--- a/arangod/Aql/SharedQueryState.cpp
+++ b/arangod/Aql/SharedQueryState.cpp
@@ -64,18 +64,18 @@ void SharedQueryState::resetWakeupHandler() {
 bool SharedQueryState::executeWakeupCallback() {
   TRI_ASSERT(_valid);
   TRI_ASSERT(_wakeupCb);
+  if (_queuedWakeup) {
+    return false;
+  }
+  _queuedWakeup = true;
+  
   auto scheduler = SchedulerFeature::SCHEDULER;
   if (ADB_UNLIKELY(scheduler == nullptr)) {
     // We are shutting down
     return false;
   }
   TRI_ASSERT(_numWakeups > 0);
-    
-  if (_queuedWakeup) {
-    return false;
-  }
   
-  _queuedWakeup = true;
   return scheduler->queue(RequestLane::CLIENT_AQL,
                           [self = shared_from_this(),
                            cb = _wakeupCb] () mutable {
diff --git a/arangod/Aql/UnsortedGatherExecutor.cpp b/arangod/Aql/UnsortedGatherExecutor.cpp
index 78ef736b43..9fff8e48b8 100644
--- a/arangod/Aql/UnsortedGatherExecutor.cpp
+++ b/arangod/Aql/UnsortedGatherExecutor.cpp
@@ -81,7 +81,6 @@ std::pair<ExecutionState, NoStats> UnsortedGatherExecutor::produceRows(OutputAql
     i = (_currentDependency + x) % _numberDependencies;
   
     if (_upstream[i] == ExecutionState::DONE) {
-      LOG_DEVEL << "dependency " << i << " done";
       continue;
     }
     
@@ -98,12 +97,6 @@ std::pair<ExecutionState, NoStats> UnsortedGatherExecutor::produceRows(OutputAql
       }
     }
     
-    if (tmp > 0) {
-      LOG_DEVEL << "dependency " << i << " state " << state << " returned " << tmp;
-    } else {
-      LOG_DEVEL << "dependency " << i << " state " << state;
-    }
-    
     _upstream[i] = state;
     if (state == ExecutionState::HASMORE) {
       more = true;