diff --git a/packages/frontend-core/src/components/grid/stores/datasource.ts b/packages/frontend-core/src/components/grid/stores/datasource.ts
index 7fca6ace49..0b07796fde 100644
--- a/packages/frontend-core/src/components/grid/stores/datasource.ts
+++ b/packages/frontend-core/src/components/grid/stores/datasource.ts
@@ -71,7 +71,7 @@ export const deriveStores = (context: StoreContext): DerivedDatasourceStore => {
   } = context
 
   const schema = derived(definition, $definition => {
-    const schema: Record<string, any> | null | undefined = getDatasourceSchema({
+    const schema: Record<string, any> | undefined = getDatasourceSchema({
       API,
       datasource: get(datasource) as any,
       definition: $definition ?? undefined,
@@ -186,7 +186,7 @@ export const createActions = (context: StoreContext): ActionDatasourceStore => {
       API,
       datasource: get(datasource) as any,
     })
-    definition.set((def as any) ?? null)
+    definition.set(def as any)
   }
 
   // Saves the datasource definition
diff --git a/packages/frontend-core/src/fetch/TableFetch.ts b/packages/frontend-core/src/fetch/TableFetch.ts
index c1152f2869..f5927262cb 100644
--- a/packages/frontend-core/src/fetch/TableFetch.ts
+++ b/packages/frontend-core/src/fetch/TableFetch.ts
@@ -37,7 +37,7 @@ export default class TableFetch extends DataFetch<UITable, Table> {
     // Search table
     try {
       const res = await this.API.searchTable(tableId, {
-        query: query ?? undefined,
+        query,
         limit,
         sort: sortColumn,
         sortOrder: sortOrder ?? SortOrder.ASCENDING,
diff --git a/packages/frontend-core/src/fetch/UserFetch.ts b/packages/frontend-core/src/fetch/UserFetch.ts
index 8f1ef36cac..656cd840fe 100644
--- a/packages/frontend-core/src/fetch/UserFetch.ts
+++ b/packages/frontend-core/src/fetch/UserFetch.ts
@@ -52,7 +52,7 @@ export default class UserFetch extends DataFetch<
 
     const finalQuery: SearchFilters = utils.isSupportedUserSearch(rest)
       ? rest
-      : { [BasicOperator.EMPTY]: { email: true } }
+      : { [BasicOperator.EMPTY]: { email: null } }
 
     try {
       const opts: SearchUsersRequest = {