diff --git a/src/routes/(console)/account/payments/+page.svelte b/src/routes/(console)/account/payments/+page.svelte
index f3e39a831..6d36599cd 100644
--- a/src/routes/(console)/account/payments/+page.svelte
+++ b/src/routes/(console)/account/payments/+page.svelte
@@ -16,7 +16,9 @@
         if (page.url.searchParams.has('clientSecret')) {
             const clientSecret = page.url.searchParams.get('clientSecret');
             const paymentMethodId = page.url.searchParams.get('paymentMethodId');
-            await confirmPayment({ clientSecret, paymentMethodId });
+            if (clientSecret && paymentMethodId) {
+                await confirmPayment({ clientSecret, paymentMethodId });
+            }
         }
     });
 </script>
diff --git a/src/routes/(console)/organization-[organization]/billing/retryPaymentModal.svelte b/src/routes/(console)/organization-[organization]/billing/retryPaymentModal.svelte
index 5cbcda62a..9f351e2cb 100644
--- a/src/routes/(console)/organization-[organization]/billing/retryPaymentModal.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/retryPaymentModal.svelte
@@ -24,7 +24,7 @@
     import type { Models } from '@appwrite.io/console';
 
     export let show = false;
-    export let invoice: Models.Invoice;
+    export let invoice: Models.Invoice | null = null;
 
     let name: string;
     let state: string = '';