diff --git a/src/routes/invoices.index.tsx b/src/routes/invoices.index.tsx
index 2bf6e92..de93113 100644
--- a/src/routes/invoices.index.tsx
+++ b/src/routes/invoices.index.tsx
@@ -117,22 +117,24 @@ function InvoicesIndex() {
     try {
       setTabsLoaded(false);
       const [t, e] = await Promise.all([
-        fetchAllPages<any>((from, to) =>
-          supabase
+        fetchAllPages<any>(async (from, to) => {
+          const result = await supabase
             .from("time_entries")
             .select("id, work_date, description, hours, hourly_rate, billable, user_id, invoice_id, case_id, case:cases(id, case_number, title, client_id, client:clients(id, name)), profile:profiles!time_entries_user_id_fkey(id, full_name, email)")
             .eq("billable", true)
             .order("work_date", { ascending: false })
-            .range(from, to),
-        ),
-        fetchAllPages<any>((from, to) =>
-          supabase
+            .range(from, to);
+          return { data: result.data, error: result.error ? { message: result.error.message } : null };
+        }),
+        fetchAllPages<any>(async (from, to) => {
+          const result = await supabase
             .from("expenses")
             .select("id, expense_date, description, amount, billable, user_id, invoice_id, case_id, case:cases(id, case_number, title, client_id, client:clients(id, name)), profile:profiles!expenses_user_id_fkey(id, full_name, email)")
             .eq("billable", true)
             .order("expense_date", { ascending: false })
-            .range(from, to),
-        ),
+            .range(from, to);
+          return { data: result.data, error: result.error ? { message: result.error.message } : null };
+        }),
       ]);
       setTime(t);
       setExpenses(e);