diff --git a/adminfront/src/features/tenants/routes/TenantSchemaPage.tsx b/adminfront/src/features/tenants/routes/TenantSchemaPage.tsx
index 7b4fefa3..113d8573 100644
--- a/adminfront/src/features/tenants/routes/TenantSchemaPage.tsx
+++ b/adminfront/src/features/tenants/routes/TenantSchemaPage.tsx
@@ -56,41 +56,10 @@ export function TenantSchemaPage() {
   const canAccess =
     profile?.role === "super_admin" || profile?.role === "tenant_admin";
 
-  if (isProfileLoading) {
-    return (
-      <div className="p-8 text-center animate-pulse text-muted-foreground">
-        {t("msg.common.loading", "로딩 중...")}
-      </div>
-    );
-  }
-
-  if (!canAccess) {
-    return (
-      <div className="p-12 text-center space-y-4 bg-destructive/5 rounded-2xl border border-destructive/20 mt-6">
-        <h3 className="text-xl font-bold text-destructive">
-          {t("msg.common.forbidden", "접근 권한이 없습니다.")}
-        </h3>
-        <p className="text-muted-foreground">
-          {t(
-            "msg.admin.tenants.schema.forbidden_desc",
-            "사용자 스키마 설정은 관리자만 접근할 수 있습니다.",
-          )}
-        </p>
-      </div>
-    );
-  }
-
-  if (!tenantId) {
-    return (
-      <div className="p-8 text-center text-muted-foreground">
-        {t("msg.admin.tenants.schema.missing_id", "테넌트 ID가 없습니다.")}
-      </div>
-    );
-  }
-
   const tenantQuery = useQuery({
     queryKey: ["tenant", tenantId],
-    queryFn: () => fetchTenant(tenantId),
+    queryFn: () => fetchTenant(tenantId!),
+    enabled: !!tenantId && canAccess,
   });
 
   const [fields, setFields] = useState<SchemaField[]>([]);
@@ -130,7 +99,7 @@ export function TenantSchemaPage() {
       newConfig.loginIdField = undefined;
       newConfig.userSchema = newFields;
 
-      return updateTenant(tenantId, {
+      return updateTenant(tenantId!, {
         config: newConfig,
       });
     },
@@ -151,6 +120,38 @@ export function TenantSchemaPage() {
     },
   });
 
+  if (isProfileLoading) {
+    return (
+      <div className="p-8 text-center animate-pulse text-muted-foreground">
+        {t("msg.common.loading", "로딩 중...")}
+      </div>
+    );
+  }
+
+  if (!canAccess) {
+    return (
+      <div className="p-12 text-center space-y-4 bg-destructive/5 rounded-2xl border border-destructive/20 mt-6">
+        <h3 className="text-xl font-bold text-destructive">
+          {t("msg.common.forbidden", "접근 권한이 없습니다.")}
+        </h3>
+        <p className="text-muted-foreground">
+          {t(
+            "msg.admin.tenants.schema.forbidden_desc",
+            "사용자 스키마 설정은 관리자만 접근할 수 있습니다.",
+          )}
+        </p>
+      </div>
+    );
+  }
+
+  if (!tenantId) {
+    return (
+      <div className="p-8 text-center text-muted-foreground">
+        {t("msg.admin.tenants.schema.missing_id", "테넌트 ID가 없습니다.")}
+      </div>
+    );
+  }
+
   const addField = () => {
     setFields([
       ...fields,