diff --git a/packages/server/src/sdk/app/rows/search.ts b/packages/server/src/sdk/app/rows/search.ts
index 8a0fa3b2f8..8de5818805 100644
--- a/packages/server/src/sdk/app/rows/search.ts
+++ b/packages/server/src/sdk/app/rows/search.ts
@@ -78,6 +78,8 @@ export async function search(
 
       const queryableFields = await getQueryableFields(table, visibleFields)
       options.query = removeInvalidFilters(options.query, queryableFields)
+    } else {
+      options.query = {}
     }
 
     if (options.viewId) {
@@ -120,7 +122,7 @@ export async function search(
       options.query = await enrichSearchContext(options.query, context)
     }
 
-    options.query = dataFilters.cleanupQuery(options.query || {})
+    options.query = dataFilters.cleanupQuery(options.query)
     options.query = dataFilters.fixupFilterArrays(options.query)
 
     span.addTags({