diff --git a/dolphinscheduler-ui-next/src/views/security/tenant-manage/components/tenant-modal.tsx b/dolphinscheduler-ui-next/src/views/security/tenant-manage/components/tenant-modal.tsx
index 9636f5773d..f6e14f989e 100644
--- a/dolphinscheduler-ui-next/src/views/security/tenant-manage/components/tenant-modal.tsx
+++ b/dolphinscheduler-ui-next/src/views/security/tenant-manage/components/tenant-modal.tsx
@@ -57,7 +57,7 @@ const TenantModal = defineComponent({
     watch(
       () => props.showModalRef,
       () => {
-        props.showModalRef && getListData()
+        props.showModalRef && getListData(props.statusRef)
       }
     )
 
@@ -67,6 +67,7 @@ const TenantModal = defineComponent({
         if (props.statusRef === 0) {
           variables.model.tenantCode = ''
           variables.model.description = ''
+          variables.model.queueId = null
         } else {
           variables.model.id = props.row.id
           variables.model.tenantCode = props.row.tenantCode
diff --git a/dolphinscheduler-ui-next/src/views/security/tenant-manage/components/use-modalData.ts b/dolphinscheduler-ui-next/src/views/security/tenant-manage/components/use-modalData.ts
index 3084721070..331573c56a 100644
--- a/dolphinscheduler-ui-next/src/views/security/tenant-manage/components/use-modalData.ts
+++ b/dolphinscheduler-ui-next/src/views/security/tenant-manage/components/use-modalData.ts
@@ -34,7 +34,7 @@ export function useModalData(
       id: ref<number>(-1),
       tenantCode: ref(''),
       description: ref(''),
-      queueId: ref<number>(-1),
+      queueId: ref<number | null>(null),
       generalOptions: []
     },
     saving: false,
@@ -48,7 +48,7 @@ export function useModalData(
     }
   })
 
-  const getListData = () => {
+  const getListData = (status: number) => {
     const { state } = useAsyncState(
       queryList().then((res: any) => {
         variables.model.generalOptions = res.map((item: any) => {
@@ -57,7 +57,9 @@ export function useModalData(
             value: item.id
           }
         })
-        variables.model.queueId = res[0].id
+        if (status === 0) {
+          variables.model.queueId = res[0].id
+        }
       }),
       {}
     )
@@ -84,13 +86,14 @@ export function useModalData(
       (unused: any) => {
         const data = {
           tenantCode: variables.model.tenantCode,
-          queueId: variables.model.queueId,
+          queueId: variables.model.queueId as number,
           description: variables.model.description
         }
         createTenant(data).then(
           (unused: any) => {
             variables.model.tenantCode = ''
             variables.model.description = ''
+            variables.model.queueId = null
             ctx.emit('confirmModal', props.showModalRef)
           },
           (unused: any) => {