diff --git a/packages/stack-server/src/app/(main)/(protected)/projects/[projectId]/team-permissions/page-client.tsx b/packages/stack-server/src/app/(main)/(protected)/projects/[projectId]/team-permissions/page-client.tsx
index 9cfd69bf8..de9eda3c5 100644
--- a/packages/stack-server/src/app/(main)/(protected)/projects/[projectId]/team-permissions/page-client.tsx
+++ b/packages/stack-server/src/app/(main)/(protected)/projects/[projectId]/team-permissions/page-client.tsx
@@ -62,7 +62,7 @@ function CreateDialog(props: {
       <>
         <InputField control={form.control} label="ID" name="id" />
         <InputField control={form.control} label="Description" name="description" />
-        {permissions && <PermissionListField control={form.control} name="containPermissionIds" permissions={permissions} type="new" />}
+        <PermissionListField control={form.control} name="containPermissionIds" permissions={permissions} type="new" />
       </>
     )}
     onSubmit={async (values) => {
diff --git a/packages/stack-server/src/components/data-table/team-permission-table.tsx b/packages/stack-server/src/components/data-table/team-permission-table.tsx
index 4f1a59b1e..7ba9a3245 100644
--- a/packages/stack-server/src/components/data-table/team-permission-table.tsx
+++ b/packages/stack-server/src/components/data-table/team-permission-table.tsx
@@ -50,13 +50,13 @@ function EditDialog(props: {
       <>
         <InputField control={form.control} label="ID" name="id" />
         <InputField control={form.control} label="Description" name="description" />
-        {permissions && <PermissionListField
+        <PermissionListField
           control={form.control} 
           name="containPermissionIds" 
           permissions={permissions} 
           type="edit" 
           selectedPermissionId={props.selectedPermissionId} 
-        />}
+        />
       </>
     )}
     onSubmit={async (values) => {
diff --git a/packages/stack-server/src/components/permission-field.tsx b/packages/stack-server/src/components/permission-field.tsx
index db683a629..8575e11de 100644
--- a/packages/stack-server/src/components/permission-field.tsx
+++ b/packages/stack-server/src/components/permission-field.tsx
@@ -158,7 +158,9 @@ export function PermissionListField<F extends FieldValues>(props: {
   // @ts-ignore
   }, [props.permissions, props.selectedPermissionId, props.type, props.user, props.team]);
 
-  if (!graph) return null;
+  if (!graph || Object.values(graph.permissions).length <= 1) {
+    return null;
+  }
 
   const currentPermission = graph.permissions[PLACEHOLDER_ID];