diff --git a/frontend/src/components/Layouts/AppSidebar.vue b/frontend/src/components/Layouts/AppSidebar.vue
index 38a9d27f..325ecb80 100644
--- a/frontend/src/components/Layouts/AppSidebar.vue
+++ b/frontend/src/components/Layouts/AppSidebar.vue
@@ -296,16 +296,15 @@ function getIcon(routeName, icon) {
 // onboarding
 const { isOnboardingStepsCompleted, setUp } = useOnboarding('frappecrm')
 
-const firstLead = ref('')
-const firstDeal = ref('')
-
 async function getFirstLead() {
-  if (firstLead.value) return firstLead.value
+  let firstLead = localStorage.getItem('firstLead')
+  if (firstLead) return firstLead
   return await call('crm.api.onboarding.get_first_lead')
 }
 
 async function getFirstDeal() {
-  if (firstDeal.value) return firstDeal.value
+  let firstDeal = localStorage.getItem('firstDeal')
+  if (firstDeal) return firstDeal
   return await call('crm.api.onboarding.get_first_deal')
 }
 
diff --git a/frontend/src/components/Modals/LeadModal.vue b/frontend/src/components/Modals/LeadModal.vue
index 2d5de02d..95e0add2 100644
--- a/frontend/src/components/Modals/LeadModal.vue
+++ b/frontend/src/components/Modals/LeadModal.vue
@@ -168,7 +168,9 @@ function createNewLead() {
       isLeadCreating.value = false
       show.value = false
       router.push({ name: 'Lead', params: { leadId: data.name } })
-      updateOnboardingStep('create_first_lead')
+      updateOnboardingStep('create_first_lead', true, false, () => {
+        localStorage.setItem('firstLead', data.name)
+      })
     },
     onError(err) {
       isLeadCreating.value = false
diff --git a/frontend/src/pages/Lead.vue b/frontend/src/pages/Lead.vue
index a7a1e3d6..22041c7a 100644
--- a/frontend/src/pages/Lead.vue
+++ b/frontend/src/pages/Lead.vue
@@ -657,7 +657,9 @@ async function convertToDeal() {
     existingOrganizationChecked.value = false
     existingContact.value = ''
     existingOrganization.value = ''
-    updateOnboardingStep('convert_lead_to_deal')
+    updateOnboardingStep('convert_lead_to_deal', true, false, () => {
+      localStorage.setItem('firstDeal', _deal)
+    })
     capture('convert_lead_to_deal')
     router.push({ name: 'Deal', params: { dealId: _deal } })
   }