diff --git a/packages/frontend-core/src/fetch/DataFetch.ts b/packages/frontend-core/src/fetch/DataFetch.ts
index e5d899d596..c0be73dd2f 100644
--- a/packages/frontend-core/src/fetch/DataFetch.ts
+++ b/packages/frontend-core/src/fetch/DataFetch.ts
@@ -324,7 +324,7 @@ export default abstract class DataFetch<
     }
 
     // If we don't support sorting, do a client-side sort
-    if (!this.features.supportsSort && clientSideSorting) {
+    if (!this.features.supportsSort && clientSideSorting && sortType) {
       rows = sort(rows, sortColumn as any, sortOrder, sortType)
     }
 
diff --git a/packages/shared-core/src/filters.ts b/packages/shared-core/src/filters.ts
index a1e8534a95..b711d4cb61 100644
--- a/packages/shared-core/src/filters.ts
+++ b/packages/shared-core/src/filters.ts
@@ -552,7 +552,7 @@ export function search<T extends Record<string, any>>(
  */
 export function runQuery<T extends Record<string, any>>(
   docs: T[],
-  query: SearchFilters | null
+  query: SearchFilters
 ): T[] {
   if (!docs || !Array.isArray(docs)) {
     return []
@@ -876,7 +876,7 @@ export function sort<T extends Record<string, any>>(
   docs: T[],
   sort: keyof T,
   sortOrder: SortOrder,
-  sortType: SortType | null = SortType.STRING
+  sortType = SortType.STRING
 ): T[] {
   if (!sort || !sortOrder || !sortType) {
     return docs