diff --git a/ChangeLog b/ChangeLog
index a5550635d..adf9224a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -200,6 +200,7 @@
   is no longer supported.
 - Correct a false-positive warning when a due date is removed and a wait is
   added.
+- When GC is turned off, disable the query shortcuts, which no longer apply.
 
 ------ current release ---------------------------
 
diff --git a/src/Filter.cpp b/src/Filter.cpp
index 56cd11a85..9fbd69e07 100644
--- a/src/Filter.cpp
+++ b/src/Filter.cpp
@@ -234,6 +234,10 @@ bool Filter::hasMiscellaneous ()
 // guaranteed to only need data from pending.data.
 bool Filter::pendingOnly ()
 {
+  // When GC is off, there are no shortcuts.
+  if (! context.config.getBoolean ("gc"))
+    return false;
+
   // To skip loading completed.data, there should be:
   // - 'status' in filter
   // - no 'completed'