diff --git a/src/routes/console/+layout.svelte b/src/routes/console/+layout.svelte
index dd45948cc..81fdcc85e 100644
--- a/src/routes/console/+layout.svelte
+++ b/src/routes/console/+layout.svelte
@@ -21,7 +21,8 @@
         paymentExpired,
         checkForMarkedForDeletion,
         checkForMandate,
-        checkForMissingPaymentMethod
+        checkForMissingPaymentMethod,
+        plansInfo
     } from '$lib/stores/billing';
     import { goto } from '$app/navigation';
     import { CommandCenter, registerCommands, registerSearchers } from '$lib/commandCenter';
@@ -269,10 +270,12 @@
             await checkForUsageLimit(org);
             checkForMarkedForDeletion(org);
             if (org?.billingPlan !== BillingPlan.STARTER) {
-                calculateTrialDay(org);
                 await paymentExpired(org);
                 await checkPaymentAuthorizationRequired(org);
                 await checkForMandate(org);
+                if ($plansInfo.get(org.billingPlan)?.trialDays) {
+                    calculateTrialDay(org);
+                }
             }
         }
     });
diff --git a/src/routes/console/wizard/cloudOrganization/confirmDetails.svelte b/src/routes/console/wizard/cloudOrganization/confirmDetails.svelte
index 214a2cc24..36b0ec6df 100644
--- a/src/routes/console/wizard/cloudOrganization/confirmDetails.svelte
+++ b/src/routes/console/wizard/cloudOrganization/confirmDetails.svelte
@@ -9,6 +9,7 @@
     import type { Coupon } from '$lib/sdk/billing';
     import { plansInfo } from '$lib/stores/billing';
     import { sdk } from '$lib/stores/sdk';
+    import { onMount } from 'svelte';
     import { createOrganization, createOrganizationFinalAction } from './store';
 
     const plan = $plansInfo?.get($createOrganization.billingPlan);
@@ -18,6 +19,8 @@
     const today = new Date();
     const billingPayDate = new Date(today.getTime() + 44 * 24 * 60 * 60 * 1000);
 
+    onMount(() => {});
+
     let coupon: string = null;
     let couponData: Partial<Coupon> = {
         code: null,
@@ -48,6 +51,10 @@
     $: if ($createOrganization.billingPlan === BillingPlan.STARTER) {
         $createOrganizationFinalAction = 'Create organization';
     }
+
+    $: if (plan?.trialDays) {
+        $createOrganizationFinalAction = 'Start trial';
+    }
 </script>
 
 <WizardStep beforeSubmit={handleBefore}>
diff --git a/src/routes/console/wizard/cloudOrganization/store.ts b/src/routes/console/wizard/cloudOrganization/store.ts
index f25d7d5f8..55a53175c 100644
--- a/src/routes/console/wizard/cloudOrganization/store.ts
+++ b/src/routes/console/wizard/cloudOrganization/store.ts
@@ -1,13 +1,10 @@
 import { BillingPlan } from '$lib/constants';
 import type { WizardStepsType } from '$lib/layout/wizard.svelte';
-import { plansInfo, type Tier } from '$lib/stores/billing';
-import { organization } from '$lib/stores/organization';
-import { get, writable } from 'svelte/store';
+import { type Tier } from '$lib/stores/billing';
+import { writable } from 'svelte/store';
 
 export const createOrgSteps = writable<WizardStepsType>(new Map());
-export const createOrganizationFinalAction = writable<string>(
-    get(plansInfo)?.get(get(organization)?.billingPlan)?.trialDays ? 'Start trial' : 'Create'
-);
+export const createOrganizationFinalAction = writable<string>('Create');
 
 export const createOrganization = writable<{
     id?: string;
diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/confirmDetails.svelte b/src/routes/console/wizard/cloudOrganizationChangeTier/confirmDetails.svelte
index 9b87670bf..a0545d583 100644
--- a/src/routes/console/wizard/cloudOrganizationChangeTier/confirmDetails.svelte
+++ b/src/routes/console/wizard/cloudOrganizationChangeTier/confirmDetails.svelte
@@ -49,6 +49,10 @@
     $: if (!$isUpgrade) {
         $changeOrganizationFinalAction = 'Confirm plan change';
     }
+
+    $: if (plan?.trialDays) {
+        $changeOrganizationFinalAction = 'Start trial';
+    }
 </script>
 
 {#if downgradeToStarter}
diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/store.ts b/src/routes/console/wizard/cloudOrganizationChangeTier/store.ts
index 8d5fad783..57463d106 100644
--- a/src/routes/console/wizard/cloudOrganizationChangeTier/store.ts
+++ b/src/routes/console/wizard/cloudOrganizationChangeTier/store.ts
@@ -1,14 +1,11 @@
 import { BillingPlan } from '$lib/constants';
 import type { WizardStepsType } from '$lib/layout/wizard.svelte';
-import { plansInfo, type Tier } from '$lib/stores/billing';
-import { organization } from '$lib/stores/organization';
-import { get, writable } from 'svelte/store';
+import { type Tier } from '$lib/stores/billing';
+import { writable } from 'svelte/store';
 
 export const changeTierSteps = writable<WizardStepsType>(new Map());
 export const isUpgrade = writable<boolean>(false);
-export const changeOrganizationFinalAction = writable<string>(
-    get(plansInfo)?.get(get(organization)?.billingPlan)?.trialDays ? 'Start trial' : 'Create'
-);
+export const changeOrganizationFinalAction = writable<string>('Create');
 
 export const changeOrganizationTier = writable<{
     billingPlan: Tier;