diff --git a/apps/studio/components/ui/DataTable/DataTableInfinite.tsx b/apps/studio/components/ui/DataTable/DataTableInfinite.tsx
index d67f89ddef2..be67cab38aa 100644
--- a/apps/studio/components/ui/DataTable/DataTableInfinite.tsx
+++ b/apps/studio/components/ui/DataTable/DataTableInfinite.tsx
@@ -73,9 +73,10 @@ export function DataTableInfinite<TData, TValue, TMeta>({
     <Table
       ref={tableRef}
       onScroll={onScroll}
-      className={
-        isLoading ? '[mask-image:linear-gradient(to_bottom,black_70%,transparent_100%)]' : ''
-      }
+      className={cn(
+        !isLoading && rows.length === 0 && 'h-full',
+        isLoading && '[mask-image:linear-gradient(to_bottom,black_70%,transparent_100%)]'
+      )}
     >
       <TableHeader>
         <TableRow className="bg-surface-75">
@@ -146,8 +147,8 @@ export function DataTableInfinite<TData, TValue, TMeta>({
           </Fragment>
         ) : (
           <Fragment>
-            <TableRow>
-              <TableCell colSpan={columns.length} className="h-[32vh] text-center">
+            <TableRow className="hover:bg-transparent h-full">
+              <TableCell colSpan={columns.length} className="text-center">
                 <div className="flex flex-col items-center justify-center h-full gap-3">
                   <p className="text-foreground-light text-sm">No results found</p>
                 </div>
@@ -184,12 +185,15 @@ export function DataTableInfinite<TData, TValue, TMeta>({
                   </p>
                 </div>
               ) : (
-                <p className="text-xs text-foreground-lighter">
-                  No more data to load (
-                  <span className="font-mono font-medium">{formatCompactNumber(filterRows)}</span>{' '}
-                  of <span className="font-mono font-medium">{formatCompactNumber(totalRows)}</span>{' '}
-                  rows)
-                </p>
+                rows.length > 0 && (
+                  <p className="text-xs text-foreground-lighter">
+                    No more data to load (
+                    <span className="font-mono font-medium">{formatCompactNumber(filterRows)}</span>{' '}
+                    of{' '}
+                    <span className="font-mono font-medium">{formatCompactNumber(totalRows)}</span>{' '}
+                    rows)
+                  </p>
+                )
               )}
             </TableCell>
           </TableRow>