diff --git a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessGrantedList.tsx b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessGrantedList.tsx
index 588cb6e5a1..b7725a6e5a 100644
--- a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessGrantedList.tsx
+++ b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessGrantedList.tsx
@@ -117,8 +117,8 @@ export const ConnectionAccessGrantedList = observer<Props>(function ConnectionAc
                 <ConnectionAccessTableItem
                   key={team.teamId}
                   id={team.teamId}
-                  name={team.teamName || ''}
-                  tooltip={team.teamName}
+                  name={team.teamName || team.teamId}
+                  tooltip={team.teamId}
                   description={team.description}
                   icon='/icons/team.svg'
                   iconTooltip={translate('authentication_team_icon_tooltip')}
diff --git a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessList.tsx b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessList.tsx
index b51bf9f9ca..21bcbb7520 100644
--- a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessList.tsx
+++ b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessList.tsx
@@ -112,8 +112,8 @@ export const ConnectionAccessList = observer<Props>(function ConnectionAccessLis
                 <ConnectionAccessTableItem
                   key={team.teamId}
                   id={team.teamId}
-                  name={team.teamName || ''}
-                  tooltip={team.teamName}
+                  name={team.teamName || team.teamId}
+                  tooltip={team.teamId}
                   description={team.description}
                   icon='/icons/team.svg'
                   iconTooltip={translate('authentication_team_icon_tooltip')}