diff --git a/packages/server/src/api/routes/tests/row.spec.ts b/packages/server/src/api/routes/tests/row.spec.ts
index 0193ff095d..905304356c 100644
--- a/packages/server/src/api/routes/tests/row.spec.ts
+++ b/packages/server/src/api/routes/tests/row.spec.ts
@@ -1123,7 +1123,7 @@ describe.each([
         }
       }
 
-      it.only("returns table rows from view", async () => {
+      it("returns empty rows from view when no schema is passed", async () => {
         const table = await config.createTable(await userTable())
         const rows = []
         for (let i = 0; i < 10; i++) {
@@ -1135,7 +1135,17 @@ describe.each([
 
         expect(response.body.rows).toHaveLength(10)
         expect(response.body).toEqual({
-          rows: expect.arrayContaining(rows.map(expect.objectContaining)),
+          rows: expect.arrayContaining(
+            rows.map(r => ({
+              _viewId: createViewResponse.id,
+              tableId: table._id,
+              _id: r._id,
+              _rev: r._rev,
+              ...defaultRowFields,
+            }))
+          ),
+          hasNextPage: false,
+          bookmark: null,
         })
       })
 
diff --git a/packages/server/src/sdk/app/rows/search.ts b/packages/server/src/sdk/app/rows/search.ts
index 4861f473ea..afee18b57c 100644
--- a/packages/server/src/sdk/app/rows/search.ts
+++ b/packages/server/src/sdk/app/rows/search.ts
@@ -20,7 +20,7 @@ function pickApi(tableId: any) {
 export async function search(options: SearchParams): Promise<{
   rows: any[]
   hasNextPage?: boolean
-  bookmark?: number | null
+  bookmark?: number | string | null
 }> {
   return pickApi(options.tableId).search(options)
 }
diff --git a/packages/server/src/sdk/app/rows/search/internal.ts b/packages/server/src/sdk/app/rows/search/internal.ts
index 4cdeca87f6..0a6fd69ff6 100644
--- a/packages/server/src/sdk/app/rows/search/internal.ts
+++ b/packages/server/src/sdk/app/rows/search/internal.ts
@@ -59,7 +59,11 @@ export async function search(options: SearchParams) {
   if (paginate) {
     response = await paginatedSearch(query, params)
   } else {
-    response = await fullSearch(query, params)
+    response = {
+      ...(await fullSearch(query, params)),
+      hasNextPage: false,
+      bookmark: null,
+    }
   }
 
   // Enrich search results with relationships