diff --git a/XCode/Cache/FieldCache.cs b/XCode/Cache/FieldCache.cs
index cbeb5609f..7c8c6cbc4 100644
--- a/XCode/Cache/FieldCache.cs
+++ b/XCode/Cache/FieldCache.cs
@@ -65,7 +65,12 @@ private void Init()
         }
     }
 
-    private IList<TEntity> Search() => Entity<TEntity>.FindAll(Where?.GroupBy(_field), OrderBy, _Unique.Count("group_count")! & _field, 0, MaxRows);
+    private IList<TEntity> Search()
+    {
+        Expression? exp = Where?.GroupBy(_field);
+        exp ??= _field.GroupBy();
+        return Entity<TEntity>.FindAll(exp, OrderBy, _Unique.Count("group_count")! & _field, 0, MaxRows);
+    }
 
     private IDictionary<String, String> GetAll()
     {