diff --git a/frontend/src/pages/VerifyEmailPage.tsx b/frontend/src/pages/VerifyEmailPage.tsx
index 2d9a3c84..2a9973bf 100644
--- a/frontend/src/pages/VerifyEmailPage.tsx
+++ b/frontend/src/pages/VerifyEmailPage.tsx
@@ -7,15 +7,11 @@ import { cn } from '@/lib/utils'
 export function VerifyEmailPage() {
   const [searchParams] = useSearchParams()
   const token = searchParams.get('token')
-  const [status, setStatus] = useState<'loading' | 'success' | 'error'>('loading')
-  const [errorMessage, setErrorMessage] = useState('')
+  const [status, setStatus] = useState<'loading' | 'success' | 'error'>(token ? 'loading' : 'error')
+  const [errorMessage, setErrorMessage] = useState(token ? '' : 'No verification token provided')
 
   useEffect(() => {
-    if (!token) {
-      setStatus('error')
-      setErrorMessage('No verification token provided')
-      return
-    }
+    if (!token) return
 
     authApi.verifyEmail(token)
       .then(() => setStatus('success'))