diff --git a/src/routes/(console)/organization-[organization]/billing/paymentHistory.svelte b/src/routes/(console)/organization-[organization]/billing/paymentHistory.svelte
index ea6265f7c..dd3b9ecf7 100644
--- a/src/routes/(console)/organization-[organization]/billing/paymentHistory.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/paymentHistory.svelte
@@ -29,10 +29,10 @@
     import { trackEvent } from '$lib/actions/analytics';
     import { selectedInvoice, showRetryModal } from './store';
     import { organization } from '$lib/stores/organization';
-    import { BillingPlan } from '$lib/constants';
 
     let showDropdown = [];
     let showFailedError = false;
+    let isLoadingInvoices = true;
 
     let offset = 0;
     let invoiceList: InvoiceList = {
@@ -46,6 +46,7 @@
     onMount(request);
 
     async function request() {
+        isLoadingInvoices = true;
         invoiceList = await sdk.forConsole.billing.listInvoices($page.params.organization, [
             Query.limit(limit),
             Query.offset(offset),
@@ -53,6 +54,7 @@
             Query.notEqual('status', 'pending'),
             Query.orderDesc('$createdAt')
         ]);
+        isLoadingInvoices = false;
     }
 
     function retryPayment(invoice: Invoice) {
@@ -65,144 +67,150 @@
     }
 </script>
 
-{#if $organization?.billingPlan === BillingPlan.FREE && invoiceList.total > 0}
-    <CardGrid>
-        <Heading tag="h2" size="6">Payment history</Heading>
+<CardGrid>
+    <Heading tag="h2" size="6">Payment history</Heading>
 
-        <p class="text">
-            Transaction history for this organization. Download invoices for more details about your
-            payments.
-        </p>
-        <svelte:fragment slot="aside">
-            {#if invoiceList.total > 0}
-                <TableScroll noMargin transparent noStyles>
-                    <TableHeader>
-                        <TableCellHead width={100}>Due Date</TableCellHead>
-                        <TableCellHead width={80}>Status</TableCellHead>
-                        <TableCellHead width={100}>Amount Due</TableCellHead>
-                        <TableCellHead width={40} />
-                    </TableHeader>
-                    <TableBody>
-                        {#each invoiceList?.invoices as invoice, i}
-                            {@const status = invoice.status}
-                            <TableRow>
-                                <TableCellText title="date">
-                                    {toLocaleDate(invoice.dueAt)}
-                                </TableCellText>
-                                <TableCell title="status">
-                                    {#if invoice?.lastError}
-                                        <DropList bind:show={showFailedError}>
-                                            <Pill
-                                                danger={status === 'overdue' ||
-                                                    status === 'failed' ||
-                                                    status === 'requires_authentication'}
-                                                success={status === 'paid' ||
-                                                    status === 'succeeded'}
-                                                warning={status === 'pending'}
-                                                on:click={() => (showFailedError = true)}
-                                                button>
-                                                {status === 'requires_authentication'
-                                                    ? 'failed'
-                                                    : status}
-                                            </Pill>
-                                            <svelte:fragment slot="list">
-                                                <li>
-                                                    The scheduled payment has failed.
-                                                    <Button
-                                                        link
-                                                        on:click={() => {
-                                                            retryPayment(invoice);
-                                                            showFailedError = false;
-                                                        }}
-                                                        >Try again
-                                                    </Button>
-                                                    .
-                                                </li>
-                                            </svelte:fragment>
-                                        </DropList>
-                                    {:else}
+    <p class="text">
+        Transaction history for this organization. Download invoices for more details about your
+        payments.
+    </p>
+    <svelte:fragment slot="aside">
+        {#if invoiceList.total > 0}
+            <TableScroll noMargin transparent noStyles>
+                <TableHeader>
+                    <TableCellHead width={100}>Due Date</TableCellHead>
+                    <TableCellHead width={80}>Status</TableCellHead>
+                    <TableCellHead width={100}>Amount Due</TableCellHead>
+                    <TableCellHead width={40} />
+                </TableHeader>
+                <TableBody>
+                    {#each invoiceList?.invoices as invoice, i}
+                        {@const status = invoice.status}
+                        <TableRow>
+                            <TableCellText title="date">
+                                {toLocaleDate(invoice.dueAt)}
+                            </TableCellText>
+                            <TableCell title="status">
+                                {#if invoice?.lastError}
+                                    <DropList bind:show={showFailedError}>
                                         <Pill
                                             danger={status === 'overdue' ||
                                                 status === 'failed' ||
                                                 status === 'requires_authentication'}
                                             success={status === 'paid' || status === 'succeeded'}
-                                            warning={status === 'pending'}>
+                                            warning={status === 'pending'}
+                                            on:click={() => (showFailedError = true)}
+                                            button>
                                             {status === 'requires_authentication'
                                                 ? 'failed'
                                                 : status}
                                         </Pill>
-                                    {/if}
-                                </TableCell>
-                                <TableCellText title="due">
-                                    {formatCurrency(invoice.grossAmount)}
-                                </TableCellText>
-                                <TableCell showOverflow right>
-                                    <DropList
-                                        bind:show={showDropdown[i]}
-                                        placement="bottom-start"
-                                        noArrow>
-                                        <Button
-                                            round
-                                            text
-                                            noMargin
-                                            ariaLabel="More options"
-                                            on:click={() => {
-                                                showDropdown[i] = !showDropdown[i];
-                                            }}>
-                                            <span class="icon-dots-horizontal" aria-hidden="true" />
-                                        </Button>
                                         <svelte:fragment slot="list">
-                                            <DropListLink
-                                                icon="external-link"
-                                                external
-                                                href={`${endpoint}/organizations/${$page.params.organization}/invoices/${invoice.$id}/view`}
-                                                on:click={() =>
-                                                    (showDropdown[i] = !showDropdown[i])}
-                                                event="view_invoice">
-                                                View invoice
-                                            </DropListLink>
-                                            <DropListLink
-                                                icon="download"
-                                                href={`${endpoint}/organizations/${$page.params.organization}/invoices/${invoice.$id}/download`}
-                                                on:click={() => {
-                                                    showDropdown[i] = !showDropdown[i];
-                                                }}
-                                                event="download_invoice">
-                                                Download PDF
-                                            </DropListLink>
-                                            {#if status === 'overdue' || status === 'failed'}
-                                                <DropListItem
-                                                    icon="refresh"
+                                            <li>
+                                                The scheduled payment has failed.
+                                                <Button
+                                                    link
                                                     on:click={() => {
                                                         retryPayment(invoice);
-                                                        showDropdown[i] = !showDropdown[i];
-                                                        trackEvent(`click_retry_payment`, {
-                                                            from: 'button',
-                                                            source: 'billing_invoice_menu'
-                                                        });
-                                                    }}>
-                                                    Retry payment
-                                                </DropListItem>
-                                            {/if}
+                                                        showFailedError = false;
+                                                    }}
+                                                    >Try again
+                                                </Button>
+                                                .
+                                            </li>
                                         </svelte:fragment>
                                     </DropList>
-                                </TableCell>
-                            </TableRow>
-                        {/each}
-                    </TableBody>
-                </TableScroll>
-                <div class="u-flex u-main-space-between">
-                    <p class="text">Total results: {invoiceList?.total ?? 0}</p>
-                    <PaginationInline {limit} bind:offset sum={invoiceList?.total ?? 0} hidePages />
-                </div>
-            {:else}
-                <EmptySearch hidePagination>
-                    <p class="text u-text-center">
-                        You have no payment history. After you receive your first invoice, you'll
-                        see it here.
-                    </p>
-                </EmptySearch>
-            {/if}
-        </svelte:fragment>
-    </CardGrid>
-{/if}
+                                {:else}
+                                    <Pill
+                                        danger={status === 'overdue' ||
+                                            status === 'failed' ||
+                                            status === 'requires_authentication'}
+                                        success={status === 'paid' || status === 'succeeded'}
+                                        warning={status === 'pending'}>
+                                        {status === 'requires_authentication' ? 'failed' : status}
+                                    </Pill>
+                                {/if}
+                            </TableCell>
+                            <TableCellText title="due">
+                                {formatCurrency(invoice.grossAmount)}
+                            </TableCellText>
+                            <TableCell showOverflow right>
+                                <DropList
+                                    bind:show={showDropdown[i]}
+                                    placement="bottom-start"
+                                    noArrow>
+                                    <Button
+                                        round
+                                        text
+                                        noMargin
+                                        ariaLabel="More options"
+                                        on:click={() => {
+                                            showDropdown[i] = !showDropdown[i];
+                                        }}>
+                                        <span class="icon-dots-horizontal" aria-hidden="true" />
+                                    </Button>
+                                    <svelte:fragment slot="list">
+                                        <DropListLink
+                                            icon="external-link"
+                                            external
+                                            href={`${endpoint}/organizations/${$page.params.organization}/invoices/${invoice.$id}/view`}
+                                            on:click={() => (showDropdown[i] = !showDropdown[i])}
+                                            event="view_invoice">
+                                            View invoice
+                                        </DropListLink>
+                                        <DropListLink
+                                            icon="download"
+                                            href={`${endpoint}/organizations/${$page.params.organization}/invoices/${invoice.$id}/download`}
+                                            on:click={() => {
+                                                showDropdown[i] = !showDropdown[i];
+                                            }}
+                                            event="download_invoice">
+                                            Download PDF
+                                        </DropListLink>
+                                        {#if status === 'overdue' || status === 'failed'}
+                                            <DropListItem
+                                                icon="refresh"
+                                                on:click={() => {
+                                                    retryPayment(invoice);
+                                                    showDropdown[i] = !showDropdown[i];
+                                                    trackEvent(`click_retry_payment`, {
+                                                        from: 'button',
+                                                        source: 'billing_invoice_menu'
+                                                    });
+                                                }}>
+                                                Retry payment
+                                            </DropListItem>
+                                        {/if}
+                                    </svelte:fragment>
+                                </DropList>
+                            </TableCell>
+                        </TableRow>
+                    {/each}
+                </TableBody>
+            </TableScroll>
+            <div class="u-flex u-main-space-between">
+                <p class="text">Total results: {invoiceList.total}</p>
+                <PaginationInline {limit} bind:offset sum={invoiceList.total} hidePages />
+            </div>
+        {:else if isLoadingInvoices}
+            <div class="loader-holder">
+                <div class="loader" />
+            </div>
+        {:else}
+            <EmptySearch hidePagination>
+                <p class="text u-text-center">
+                    You have no payment history. After you receive your first invoice, you'll see it
+                    here.
+                </p>
+            </EmptySearch>
+        {/if}
+    </svelte:fragment>
+</CardGrid>
+
+<style>
+    .loader-holder {
+        height: 100%;
+        align-content: center;
+        justify-items: center;
+    }
+</style>