diff --git a/src/components/Setup/Views/Welcome.tsx b/src/components/Setup/Views/Welcome.tsx
index d9952c7d..a08b156e 100644
--- a/src/components/Setup/Views/Welcome.tsx
+++ b/src/components/Setup/Views/Welcome.tsx
@@ -3,13 +3,20 @@ import { useToast } from '@/components/0_Bruddle/Toast'
 import { useZeroDev } from '@/context/walletContext/zeroDevContext.context'
 import { useSetupFlow } from '@/hooks/useSetupFlow'
 import { useRouter } from 'next/navigation'
+import { useEffect } from 'react'
 
 const WelcomeStep = () => {
     const { handleNext } = useSetupFlow()
-    const { handleLogin, isLoggingIn } = useZeroDev()
+    const { handleLogin, isLoggingIn, isKernelClientReady } = useZeroDev()
     const { push } = useRouter()
     const toast = useToast()
 
+    useEffect(() => {
+        if (isKernelClientReady) {
+            push('/home')
+        }
+    }, [isKernelClientReady])
+
     return (
         <Card className="border-0">
             <Card.Content className="space-y-4 p-0">
@@ -20,9 +27,7 @@ const WelcomeStep = () => {
                     loading={isLoggingIn}
                     variant="transparent-dark"
                     onClick={() => {
-                        handleLogin()
-                            .then(() => push('/home'))
-                            .catch((_e) => toast.error('Error logging in'))
+                        handleLogin().catch((_e) => toast.error('Error logging in'))
                     }}
                 >
                     Login