diff --git a/src/components/admin/Billing/LoadError.tsx b/src/components/admin/Billing/LoadError.tsx
index 630fb98d4c..34a430006d 100644
--- a/src/components/admin/Billing/LoadError.tsx
+++ b/src/components/admin/Billing/LoadError.tsx
@@ -3,14 +3,12 @@ import { Grid } from '@mui/material';
 import { FormattedMessage } from 'react-intl';
 
 import AlertBox from 'src/components/shared/AlertBox';
-import { useBillingStore } from 'src/stores/Billing';
+import { useBillingInvoices } from 'src/hooks/billing/useBillingInvoices';
 
 function BillingLoadError() {
-    const hydrationErrorsExist = useBillingStore(
-        (state) => state.hydrationErrorsExist
-    );
+    const { errorExists } = useBillingInvoices();
 
-    if (!hydrationErrorsExist) {
+    if (!errorExists) {
         return null;
     }
 
diff --git a/src/components/admin/Billing/PricingTierDetails.tsx b/src/components/admin/Billing/PricingTierDetails.tsx
index 20db091910..8102906886 100644
--- a/src/components/admin/Billing/PricingTierDetails.tsx
+++ b/src/components/admin/Billing/PricingTierDetails.tsx
@@ -13,7 +13,6 @@ function PricingTierDetails() {
     const [externalPaymentMethod, marketPlaceProvider] =
         useTenantUsesExternalPayment(selectedTenant);
 
-    const billingStoreHydrated = useBillingStore((state) => state.hydrated);
     const paymentMethodExists = useBillingStore(
         (state) => state.paymentMethodExists
     );
@@ -38,7 +37,7 @@ function PricingTierDetails() {
         return 'admin.billing.message.freeTier';
     }, [externalPaymentMethod, marketPlaceProvider, paymentMethodExists]);
 
-    if (!billingStoreHydrated || typeof paymentMethodExists !== 'boolean') {
+    if (typeof paymentMethodExists !== 'boolean') {
         return (
             <Skeleton>
                 <Typography>
diff --git a/src/components/admin/Billing/index.tsx b/src/components/admin/Billing/index.tsx
index e769541e49..129e9d6c97 100644
--- a/src/components/admin/Billing/index.tsx
+++ b/src/components/admin/Billing/index.tsx
@@ -1,25 +1,16 @@
 import type { AdminBillingProps } from 'src/components/admin/Billing/types';
 
-import { useEffect, useMemo } from 'react';
-import useConstant from 'use-constant';
-
 import { Divider, Grid, Typography } from '@mui/material';
 
-import { useShallow } from 'zustand/react/shallow';
-
-import { endOfMonth, startOfMonth, subMonths } from 'date-fns';
 import { ErrorBoundary } from 'react-error-boundary';
 import { useIntl } from 'react-intl';
-import { useUnmount } from 'react-use';
 
-import { getInvoicesBetween } from 'src/api/billing';
 import { authenticatedRoutes } from 'src/app/routes';
 import DateRange from 'src/components/admin/Billing/DateRange';
 import BillingLoadError from 'src/components/admin/Billing/LoadError';
 import PaymentMethods from 'src/components/admin/Billing/PaymentMethods';
 import PricingTierDetails from 'src/components/admin/Billing/PricingTierDetails';
 import { INVOICE_ROW_HEIGHT } from 'src/components/admin/Billing/shared';
-import { useTenantChangeReset } from 'src/components/admin/Billing/useTenantChangeReset';
 import AdminTabs from 'src/components/admin/Tabs';
 import GraphLoadingState from 'src/components/graphs/states/Loading';
 import GraphStateWrapper from 'src/components/graphs/states/Wrapper';
@@ -28,14 +19,10 @@ import AlertBox from 'src/components/shared/AlertBox';
 import CardWrapper from 'src/components/shared/CardWrapper';
 import BillingHistoryTable from 'src/components/tables/Billing';
 import BillingLineItemsTable from 'src/components/tables/BillLineItems';
+import { useBillingInvoices } from 'src/hooks/billing/useBillingInvoices';
 import usePageTitle from 'src/hooks/usePageTitle';
 import { logRocketEvent } from 'src/services/shared';
 import { CustomEvents } from 'src/services/types';
-import {
-    useBilling_selectedInvoice,
-    useBillingStore,
-} from 'src/stores/Billing';
-import { useTenantStore } from 'src/stores/Tenant';
 import { invoiceId, TOTAL_CARD_HEIGHT } from 'src/utils/billing-utils';
 
 const routeTitle = authenticatedRoutes.admin.billing.title;
@@ -50,83 +37,9 @@ function AdminBilling({ showAddPayment }: AdminBillingProps) {
         headerLink: 'https://www.estuary.dev/pricing/',
     });
 
-    useTenantChangeReset();
-
     const intl = useIntl();
 
-    const selectedTenant = useTenantStore((state) => state.selectedTenant);
-
-    // Billing Store
-    // TODO (billing store)
-    // The `active` stuff could probably be removed now that other stuff is
-    //  cleaned up - but leaving to make it easier
-    const [active, setActive] = useBillingStore(
-        useShallow((state) => [state.active, state.setActive])
-    );
-    const [hydrated, setHydrated] = useBillingStore(
-        useShallow((state) => [state.hydrated, state.setHydrated])
-    );
-    const setHydrationErrorsExist = useBillingStore(
-        (state) => state.setHydrationErrorsExist
-    );
-    const setInvoices = useBillingStore((state) => state.setInvoices);
-    const setNetworkFailed = useBillingStore((state) => state.setNetworkFailed);
-
-    const selectedInvoice = useBilling_selectedInvoice();
-
-    const resetBillingState = useBillingStore((state) => state.resetState);
-
-    const currentMonth = useConstant(() => {
-        const today = new Date();
-
-        return endOfMonth(today);
-    });
-
-    const dateRange = useMemo(() => {
-        const startMonth = startOfMonth(subMonths(currentMonth, 5));
-
-        return { start: startMonth, end: currentMonth };
-    }, [currentMonth]);
-
-    useEffect(() => {
-        if (selectedTenant) {
-            void (async () => {
-                setNetworkFailed(null);
-                setActive(true);
-                try {
-                    const response = await getInvoicesBetween(
-                        selectedTenant,
-                        dateRange.start,
-                        dateRange.end
-                    );
-                    if (response.error) {
-                        throw new Error(response.error.message);
-                    }
-                    setNetworkFailed(null);
-                    setHydrationErrorsExist(false);
-                    setInvoices(response.data);
-                } catch (errorMessage: unknown) {
-                    setNetworkFailed(`${errorMessage}`);
-                    setHydrationErrorsExist(true);
-                    setInvoices([]);
-                } finally {
-                    setHydrated(true);
-                    setActive(false);
-                }
-            })();
-        }
-    }, [
-        dateRange.end,
-        dateRange.start,
-        selectedTenant,
-        setActive,
-        setHydrated,
-        setHydrationErrorsExist,
-        setInvoices,
-        setNetworkFailed,
-    ]);
-
-    useUnmount(() => resetBillingState());
+    const { isLoading, selectedInvoice } = useBillingInvoices();
 
     return (
         <>
@@ -173,7 +86,7 @@ function AdminBilling({ showAddPayment }: AdminBillingProps) {
                     <CardWrapper
                         height={invoiceCardHeight}
                         message={
-                            active || !hydrated ? (
+                            isLoading ? (
                                 intl.formatMessage({
                                     id: 'admin.billing.label.lineItems.loading',
                                 })
@@ -194,7 +107,7 @@ function AdminBilling({ showAddPayment }: AdminBillingProps) {
                             )
                         }
                     >
-                        {!active && hydrated ? (
+                        {!isLoading ? (
                             <BillingLineItemsTable
                                 // The key here makes sure that any stateful fetching logic doesn't get confused.
                                 key={
diff --git a/src/components/admin/Billing/useTenantChangeReset.ts b/src/components/admin/Billing/useTenantChangeReset.ts
deleted file mode 100644
index a68e69bf53..0000000000
--- a/src/components/admin/Billing/useTenantChangeReset.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { useCallback, useEffect, useRef } from 'react';
-
-import { useBillingStore } from 'src/stores/Billing';
-import { useTenantStore } from 'src/stores/Tenant';
-
-export function useTenantChangeReset() {
-    const selectedTenant = useTenantStore((state) => state.selectedTenant);
-
-    const resetBillingState = useBillingStore((state) => state.resetState);
-
-    const resetStores = useCallback(() => {
-        resetBillingState();
-    }, [resetBillingState]);
-
-    const previousTenant = useRef(selectedTenant);
-    useEffect(() => {
-        if (previousTenant.current !== selectedTenant) {
-            previousTenant.current = selectedTenant;
-            resetStores();
-        }
-    }, [selectedTenant, resetStores]);
-}
diff --git a/src/components/graphs/TaskHoursByMonthGraph.tsx b/src/components/graphs/TaskHoursByMonthGraph.tsx
index 581c0539c2..d53e769a95 100644
--- a/src/components/graphs/TaskHoursByMonthGraph.tsx
+++ b/src/components/graphs/TaskHoursByMonthGraph.tsx
@@ -29,7 +29,7 @@ import {
 } from 'src/components/graphs/tooltips';
 import useTooltipConfig from 'src/components/graphs/useTooltipConfig';
 import { defaultOutlineColor } from 'src/context/Theme';
-import { useBillingStore } from 'src/stores/Billing';
+import { useBillingInvoices } from 'src/hooks/billing/useBillingInvoices';
 import { CARD_AREA_HEIGHT, stripTimeFromDate } from 'src/utils/billing-utils';
 
 const chartContainerId = 'task-hours-by-month';
@@ -39,8 +39,7 @@ function TaskHoursByMonthGraph() {
     const intl = useIntl();
     const tooltipConfig = useTooltipConfig();
 
-    const billingStoreHydrated = useBillingStore((state) => state.hydrated);
-    const invoices = useBillingStore((state) => state.invoices);
+    const { invoices, isLoading } = useBillingInvoices();
 
     const resizeListener = useRef<EventListener | null>(null);
     const [myChart, setMyChart] = useState<echarts.ECharts | null>(null);
@@ -85,7 +84,7 @@ function TaskHoursByMonthGraph() {
     }, [invoices, intl, today]);
 
     useEffect(() => {
-        if (billingStoreHydrated && invoices.length > 0) {
+        if (!isLoading && invoices.length > 0) {
             if (!myChart) {
                 echarts.use([
                     GridComponent,
@@ -190,7 +189,7 @@ function TaskHoursByMonthGraph() {
         }
     }, [
         invoices,
-        billingStoreHydrated,
+        isLoading,
         intl,
         months,
         myChart,
diff --git a/src/components/graphs/UsageByMonthGraph.tsx b/src/components/graphs/UsageByMonthGraph.tsx
index 0de4754ab3..20d6624c4a 100644
--- a/src/components/graphs/UsageByMonthGraph.tsx
+++ b/src/components/graphs/UsageByMonthGraph.tsx
@@ -27,7 +27,7 @@ import { useIntl } from 'react-intl';
 import useLegendConfig from 'src/components/graphs/useLegendConfig';
 import useTooltipConfig from 'src/components/graphs/useTooltipConfig';
 import { eChartsColors } from 'src/context/Theme';
-import { useBillingStore } from 'src/stores/Billing';
+import { useBillingInvoices } from 'src/hooks/billing/useBillingInvoices';
 import { CARD_AREA_HEIGHT, stripTimeFromDate } from 'src/utils/billing-utils';
 
 const chartContainerId = 'data-by-month';
@@ -40,8 +40,7 @@ function UsageByMonthGraph() {
     const tooltipConfig = useTooltipConfig();
     const legendConfig = useLegendConfig([{ name: 'Data' }, { name: 'Hours' }]);
 
-    const billingStoreHydrated = useBillingStore((state) => state.hydrated);
-    const invoices = useBillingStore((state) => state.invoices);
+    const { invoices, isLoading } = useBillingInvoices();
 
     const [myChart, setMyChart] = useState<echarts.ECharts | null>(null);
 
@@ -96,7 +95,7 @@ function UsageByMonthGraph() {
     }, [invoices, intl, today]);
 
     useEffect(() => {
-        if (billingStoreHydrated && invoices.length > 0) {
+        if (!isLoading && invoices.length > 0) {
             if (!myChart) {
                 echarts.use([
                     GridComponent,
@@ -126,7 +125,7 @@ function UsageByMonthGraph() {
         return undefined;
     }, [
         invoices,
-        billingStoreHydrated,
+        isLoading,
         intl,
         legendConfig,
         months,
diff --git a/src/components/graphs/states/Wrapper.tsx b/src/components/graphs/states/Wrapper.tsx
index 00693b82a2..f81e410f4e 100644
--- a/src/components/graphs/states/Wrapper.tsx
+++ b/src/components/graphs/states/Wrapper.tsx
@@ -7,14 +7,15 @@ import { FormattedMessage } from 'react-intl';
 import EmptyGraphState from 'src/components/graphs/states/Empty';
 import GraphLoadingState from 'src/components/graphs/states/Loading';
 import { eChartsTooltipSX } from 'src/components/graphs/tooltips';
-import { useBillingStore } from 'src/stores/Billing';
+import { useBillingInvoices } from 'src/hooks/billing/useBillingInvoices';
 import { hasLength } from 'src/utils/misc-utils';
 
 function GraphStateWrapper({ children }: BaseComponentProps) {
-    const billingStoreActive = useBillingStore((state) => state.active);
-    const billingStoreHydrated = useBillingStore((state) => state.hydrated);
-    const networkFailed = useBillingStore((state) => state.networkFailed);
-    const billingHistory = useBillingStore((state) => state.invoices);
+    const {
+        invoices: billingHistory,
+        isLoading,
+        networkFailed,
+    } = useBillingInvoices();
 
     if (networkFailed) {
         return (
@@ -29,7 +30,7 @@ function GraphStateWrapper({ children }: BaseComponentProps) {
         );
     }
 
-    if (!billingStoreActive && billingStoreHydrated) {
+    if (!isLoading) {
         return hasLength(billingHistory) ? (
             <Box sx={eChartsTooltipSX}>{children}</Box>
         ) : (
diff --git a/src/components/tables/BillLineItems/index.tsx b/src/components/tables/BillLineItems/index.tsx
index 5c1dcbce40..69ed0244ac 100644
--- a/src/components/tables/BillLineItems/index.tsx
+++ b/src/components/tables/BillLineItems/index.tsx
@@ -22,10 +22,7 @@ import TotalLines from 'src/components/tables/BillLineItems/TotalLines';
 import EntityTableBody from 'src/components/tables/EntityTable/TableBody';
 import EntityTableHeader from 'src/components/tables/EntityTable/TableHeader';
 import { getTableHeaderWithoutHeaderColor } from 'src/context/Theme';
-import {
-    useBilling_selectedInvoice,
-    useBillingStore,
-} from 'src/stores/Billing';
+import { useBillingInvoices } from 'src/hooks/billing/useBillingInvoices';
 import { useTenantStore } from 'src/stores/Tenant';
 import { TableStatuses } from 'src/types';
 
@@ -57,10 +54,7 @@ function BillingLineItemsTable() {
 
     const selectedTenant = useTenantStore((state) => state.selectedTenant);
 
-    const selectedInvoice = useBilling_selectedInvoice();
-
-    const hydrated = useBillingStore((state) => state.hydrated);
-    const invoices = useBillingStore((state) => state.invoices);
+    const { invoices, selectedInvoice, isLoading } = useBillingInvoices();
 
     const dataRows = useMemo(
         () => <Rows lineItems={selectedInvoice?.line_items ?? []} />,
@@ -120,7 +114,7 @@ function BillingLineItemsTable() {
                                 ? { status: TableStatuses.DATA_FETCHED }
                                 : { status: TableStatuses.NO_EXISTING_DATA }
                         }
-                        loading={!hydrated}
+                        loading={isLoading}
                         rows={dataRows}
                     />
                 </Table>
@@ -135,7 +129,7 @@ function BillingLineItemsTable() {
                 }}
             >
                 {selectedInvoice?.invoice_type !== 'preview' ? (
-                    hydrated ? (
+                    !isLoading ? (
                         <Box>
                             <Button
                                 href={stripeInvoice?.invoice_pdf}
diff --git a/src/components/tables/Billing/index.tsx b/src/components/tables/Billing/index.tsx
index 1f7b69a9fd..4b01a9d3c9 100644
--- a/src/components/tables/Billing/index.tsx
+++ b/src/components/tables/Billing/index.tsx
@@ -10,10 +10,7 @@ import Rows from 'src/components/tables/Billing/Rows';
 import EntityTableBody from 'src/components/tables/EntityTable/TableBody';
 import EntityTableHeader from 'src/components/tables/EntityTable/TableHeader';
 import { getTableHeaderWithoutHeaderColor } from 'src/context/Theme';
-import {
-    useBilling_selectedInvoice,
-    useBillingStore,
-} from 'src/stores/Billing';
+import { useBillingInvoices } from 'src/hooks/billing/useBillingInvoices';
 import { TableStatuses } from 'src/types';
 import { invoiceId } from 'src/utils/billing-utils';
 
@@ -46,12 +43,12 @@ export const columns: TableColumns[] = [
 function BillingHistoryTable() {
     const intl = useIntl();
 
-    const selectedInvoice = useBilling_selectedInvoice();
-
-    const active = useBillingStore((state) => state.active);
-    const hydrated = useBillingStore((state) => state.hydrated);
-    const networkFailed = useBillingStore((state) => state.networkFailed);
-    const billingHistory = useBillingStore((state) => state.invoices);
+    const {
+        invoices: billingHistory,
+        selectedInvoice,
+        isLoading,
+        networkFailed,
+    } = useBillingInvoices();
 
     const dataRows = useMemo(
         () =>
@@ -95,7 +92,7 @@ function BillingHistoryTable() {
                               ? { status: TableStatuses.NETWORK_FAILED }
                               : { status: TableStatuses.NO_EXISTING_DATA }
                     }
-                    loading={Boolean(active || !hydrated)}
+                    loading={isLoading}
                     rows={dataRows}
                 />
             </Table>
diff --git a/src/hooks/billing/useBillingInvoices.ts b/src/hooks/billing/useBillingInvoices.ts
new file mode 100644
index 0000000000..dc5f291dc8
--- /dev/null
+++ b/src/hooks/billing/useBillingInvoices.ts
@@ -0,0 +1,79 @@
+import type { Invoice } from 'src/api/billing';
+
+import { useMemo } from 'react';
+import useConstant from 'use-constant';
+
+import { useQuery } from '@supabase-cache-helpers/postgrest-swr';
+import { endOfMonth, startOfMonth, subMonths } from 'date-fns';
+
+import { getInvoicesBetween } from 'src/api/billing';
+import { checkErrorMessage, FAILED_TO_FETCH } from 'src/services/shared';
+import { useBillingStore } from 'src/stores/Billing';
+import { useTenantStore } from 'src/stores/Tenant';
+import { invoiceId } from 'src/utils/billing-utils';
+
+export interface UseBillingInvoicesResult {
+    invoices: Invoice[];
+    // The invoice currently shown in the line-item/detail views: the stored
+    // selection if it still exists in this tenant's data, otherwise the newest
+    // invoice. Falling back this way means an org switch self-corrects without
+    // anyone resetting state.
+    selectedInvoice: Invoice | null;
+    isLoading: boolean;
+    networkFailed: boolean;
+    errorExists: boolean;
+}
+
+// Fetches the selected tenant's invoices for a rolling six-month window. The
+// SWR key derives from the query (tenant + dates), so switching tenants
+// re-fetches automatically and the previous tenant's data is never shown.
+// Because `formatDateForApi` is day-granular, every component that calls this
+// hook on a given day produces the same key and shares a single request.
+export function useBillingInvoices(): UseBillingInvoicesResult {
+    const selectedTenant = useTenantStore((state) => state.selectedTenant);
+    const selectedInvoiceId = useBillingStore(
+        (state) => state.selectedInvoiceId
+    );
+
+    const dateRange = useConstant(() => {
+        const end = endOfMonth(new Date());
+
+        return { start: startOfMonth(subMonths(end, 5)), end };
+    });
+
+    const query = useMemo(
+        () =>
+            selectedTenant
+                ? getInvoicesBetween(
+                      selectedTenant,
+                      dateRange.start,
+                      dateRange.end
+                  )
+                : null,
+        [dateRange.end, dateRange.start, selectedTenant]
+    );
+
+    const { data, error, isLoading } = useQuery(query);
+
+    const invoices = useMemo(() => data ?? [], [data]);
+
+    const selectedInvoice = useMemo(() => {
+        if (invoices.length === 0) {
+            return null;
+        }
+
+        return (
+            invoices.find(
+                (invoice) => invoiceId(invoice) === selectedInvoiceId
+            ) ?? invoices[0]
+        );
+    }, [invoices, selectedInvoiceId]);
+
+    return {
+        invoices,
+        selectedInvoice,
+        isLoading,
+        networkFailed: checkErrorMessage(FAILED_TO_FETCH, error?.message),
+        errorExists: Boolean(error),
+    };
+}
diff --git a/src/stores/Billing.ts b/src/stores/Billing.ts
index 8f45e333c2..56e161313f 100644
--- a/src/stores/Billing.ts
+++ b/src/stores/Billing.ts
@@ -1,5 +1,3 @@
-import type { Invoice } from 'src/api/billing';
-import type { StoreWithHydration } from 'src/stores/extensions/Hydration';
 import type { InvoiceId } from 'src/utils/billing-utils';
 import type { NamedSet } from 'zustand/middleware';
 
@@ -9,42 +7,21 @@ import { devtools } from 'zustand/middleware';
 import produce from 'immer';
 import { isArray } from 'lodash';
 
-import {
-    getInitialHydrationData,
-    getStoreWithHydrationSettings,
-} from 'src/stores/extensions/Hydration';
-import { invoiceId } from 'src/utils/billing-utils';
 import { hasLength } from 'src/utils/misc-utils';
 import { devtoolsOptions } from 'src/utils/store-utils';
 
-interface BillingState extends StoreWithHydration {
+interface BillingState {
     selectedInvoiceId: InvoiceId | null;
     setSelectedInvoice: (value: InvoiceId) => void;
 
-    invoices: Invoice[];
-    setInvoices: (value: Invoice[]) => void;
-
     paymentMethodExists: boolean | null;
     setPaymentMethodExists: (value: any[] | undefined) => void;
-
-    resetState: () => void;
 }
 
-const getInitialStateData = (): Pick<
-    BillingState,
-    'invoices' | 'paymentMethodExists' | 'selectedInvoiceId'
-> => {
+const getInitialState = (set: NamedSet<BillingState>): BillingState => {
     return {
         selectedInvoiceId: null,
-        invoices: [],
         paymentMethodExists: null,
-    };
-};
-
-const getInitialState = (set: NamedSet<BillingState>): BillingState => {
-    return {
-        ...getInitialStateData(),
-        ...getStoreWithHydrationSettings('Billing', set),
 
         setSelectedInvoice: (value) => {
             set(
@@ -56,20 +33,6 @@ const getInitialState = (set: NamedSet<BillingState>): BillingState => {
             );
         },
 
-        setInvoices: (value) => {
-            set(
-                produce((state: BillingState) => {
-                    if (state.active) {
-                        state.invoices = value;
-                        state.selectedInvoiceId =
-                            value.length > 0 ? invoiceId(value[0]) : null;
-                    }
-                }),
-                false,
-                'Billing Details Set'
-            );
-        },
-
         setPaymentMethodExists: (value) => {
             set(
                 produce((state: BillingState) => {
@@ -80,28 +43,9 @@ const getInitialState = (set: NamedSet<BillingState>): BillingState => {
                 'Payment Exists Updated'
             );
         },
-
-        resetState: () => {
-            set(
-                { ...getInitialStateData(), ...getInitialHydrationData() },
-                false,
-                'State Reset'
-            );
-        },
     };
 };
 
 export const useBillingStore = create<BillingState>()(
     devtools((set) => getInitialState(set), devtoolsOptions('billing'))
 );
-
-// Selector Hooks
-export const useBilling_selectedInvoice = () => {
-    return useBillingStore((state) =>
-        state.selectedInvoiceId
-            ? (state.invoices.find(
-                  (inv) => invoiceId(inv) === state.selectedInvoiceId
-              ) ?? null)
-            : null
-    );
-};