diff --git a/packages/app-tenant-manager/src/components/AddTenantFormField.tsx b/packages/app-tenant-manager/src/components/AddTenantFormField.tsx
index f193db45dc2..9f62ea0909a 100644
--- a/packages/app-tenant-manager/src/components/AddTenantFormField.tsx
+++ b/packages/app-tenant-manager/src/components/AddTenantFormField.tsx
@@ -39,6 +39,11 @@ export const AddTenantFormField = memo(function AddTenantFormField({
                 selectionPath={"tenancy.createTenant.data"}
                 addSelection={querySelection}
             />
+            <AddGraphQLQuerySelection
+                operationName={"UpdateTenant"}
+                selectionPath={"tenancy.updateTenant.data"}
+                addSelection={querySelection}
+            />
             <Compose component={TenantFormFields} with={FieldHOC} />
         </Fragment>
     );
diff --git a/packages/app-tenant-manager/src/modules/tenants/TenantForm.tsx b/packages/app-tenant-manager/src/modules/tenants/TenantForm.tsx
index 5612670e724..6eafb122fe0 100644
--- a/packages/app-tenant-manager/src/modules/tenants/TenantForm.tsx
+++ b/packages/app-tenant-manager/src/modules/tenants/TenantForm.tsx
@@ -39,7 +39,7 @@ const TenantForm = () => {
     }
 
     return (
-        <Form data={{ tags: [], ...tenant }} onSubmit={onSubmit}>
+        <Form data={{ ...tenant }} onSubmit={onSubmit}>
             {({ data, form, Bind }) => (
                 <SimpleForm data-testid={"tenant-form"}>
                     {loading && <CircularProgress />}
@@ -57,7 +57,11 @@ const TenantForm = () => {
                                 </Bind>
                             </Cell>
                             <Cell span={12}>
-                                <Bind name="tags" validators={validation.create("required")}>
+                                <Bind
+                                    name="tags"
+                                    validators={validation.create("required")}
+                                    defaultValue={[]}
+                                >
                                     <Tags label={"Tags"} />
                                 </Bind>
                             </Cell>