diff --git a/src/routes/(console)/organization-[organization]/billing/billingAddress.svelte b/src/routes/(console)/organization-[organization]/billing/billingAddress.svelte
index d71d9e576f..f4422850ce 100644
--- a/src/routes/(console)/organization-[organization]/billing/billingAddress.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/billingAddress.svelte
@@ -102,6 +102,7 @@
                 </Layout.Stack>
             </Card.Base>
         {:else}
+            {@const hasBillingAddresses = $addressList.billingAddresses.length}
             <Card.Base>
                 <Layout.Stack justifyContent="center" alignItems="center" gap="m">
                     <Popover let:toggle padding="none" placement="bottom-start">
@@ -121,7 +122,9 @@
                                     <span>{address.country}</span>
                                 </ActionMenu.Item.Button>
                             {/each}
-                            <Divider />
+                            {#if hasBillingAddresses}
+                                <Divider />
+                            {/if}
                             <ActionMenu.Item.Button
                                 leadingIcon={IconPlus}
                                 on:click={() => (showCreate = true)}>
diff --git a/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte b/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte
index 14407a2e73..457e85e779 100644
--- a/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte
@@ -249,8 +249,9 @@
                                         </Layout.Stack>
                                     </ActionMenu.Item.Button>
                                 {/each}
+
+                                <Divider />
                             {/if}
-                            <Divider />
                             <ActionMenu.Item.Button
                                 leadingIcon={IconPlus}
                                 on:click={(e) => {
@@ -284,8 +285,9 @@
                                         </Layout.Stack>
                                     </ActionMenu.Item.Button>
                                 {/each}
+
+                                <Divider />
                             {/if}
-                            <Divider />
                             <ActionMenu.Item.Button
                                 leadingIcon={IconPlus}
                                 on:click={(e) => {