diff --git a/apps/web-antd/src/views/_core/authentication/login.vue b/apps/web-antd/src/views/_core/authentication/login.vue
index d83aa3cee..7145c4789 100644
--- a/apps/web-antd/src/views/_core/authentication/login.vue
+++ b/apps/web-antd/src/views/_core/authentication/login.vue
@@ -96,6 +96,13 @@ async function handleThirdLogin(type: number) {
   if (type <= 0) {
     return;
   }
+  // 多租户模式下，必须先选择租户
+  if (tenantEnable && !accessStore.tenantId) {
+    loginRef.value
+      ?.getFormApi()
+      .setFieldValue('tenantId', undefined, false);
+    return;
+  }
   try {
     // hash 路由模式下，OAuth 回调的 code 在 URL query 中，Vue Router 读不到
     // 通过 sessionStorage 传递参数，redirect_uri 只用 origin
diff --git a/apps/web-antd/src/views/_core/authentication/social-login.vue b/apps/web-antd/src/views/_core/authentication/social-login.vue
index 93f50c9db..0e632018a 100644
--- a/apps/web-antd/src/views/_core/authentication/social-login.vue
+++ b/apps/web-antd/src/views/_core/authentication/social-login.vue
@@ -213,7 +213,7 @@ const formSchema = computed((): VbenFormSchema[] => {
     >
       <div
         class="mb-4 size-8 animate-spin rounded-full border-4 border-primary border-t-transparent"
-      />
+      ></div>
       <span class="text-sm text-muted-foreground">正在登录中...</span>
     </div>