diff --git a/src/composables/auth/useFirebaseAuthActions.ts b/src/composables/auth/useFirebaseAuthActions.ts
index 81dde30168..1e80416332 100644
--- a/src/composables/auth/useFirebaseAuthActions.ts
+++ b/src/composables/auth/useFirebaseAuthActions.ts
@@ -1,6 +1,6 @@
 import { FirebaseError } from 'firebase/app'
 import { ref } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
+import { useRoute } from 'vue-router'
 
 import { useErrorHandling } from '@/composables/useErrorHandling'
 import { t } from '@/i18n'
@@ -17,7 +17,6 @@ export const useFirebaseAuthActions = () => {
   const authStore = useFirebaseAuthStore()
   const toastStore = useToastStore()
   const route = useRoute()
-  const router = useRouter()
   const { wrapWithErrorHandlingAsync, toastErrorHandler } = useErrorHandling()
 
   const accessError = ref(false)
@@ -62,8 +61,10 @@ export const useFirebaseAuthActions = () => {
     const hostname = window.location.hostname
     if (hostname.includes('cloud.comfy.org')) {
       if (route.query.inviteCode) {
-        const inviteCode = route.query.inviteCode
-        window.location.href = `/cloud/login?inviteCode=${encodeURIComponent(inviteCode)}`
+        const inviteCode = Array.isArray(route.query.inviteCode)
+          ? route.query.inviteCode[0]
+          : route.query.inviteCode
+        window.location.href = `/cloud/login?inviteCode=${encodeURIComponent(inviteCode || '')}`
       } else {
         window.location.href = '/cloud/login'
       }
diff --git a/src/platform/cloud/subscription/composables/useSubscription.ts b/src/platform/cloud/subscription/composables/useSubscription.ts
index c330723cbd..061e0bf450 100644
--- a/src/platform/cloud/subscription/composables/useSubscription.ts
+++ b/src/platform/cloud/subscription/composables/useSubscription.ts
@@ -1,5 +1,4 @@
 import { computed, ref, watch } from 'vue'
-import { useRoute } from 'vue-router'
 
 import { useCurrentUser } from '@/composables/auth/useCurrentUser'
 import { useFirebaseAuthActions } from '@/composables/auth/useFirebaseAuthActions'
@@ -109,14 +108,6 @@ export function useSubscription() {
   }
 
   const requireActiveSubscription = async (): Promise<void> => {
-    // DEFENSIVE: Never show subscription dialogs during onboarding flows
-    // All cloud onboarding routes start with '/cloud/' (login, signup, survey, waitlist, etc.)
-    // This prevents subscription enforcement from interfering with user onboarding
-    const route = useRoute()
-    if (route.path.startsWith('/cloud/')) {
-      return
-    }
-
     await fetchSubscriptionStatus()
 
     if (!isActiveSubscription.value) {