diff --git a/app/portainer/home/EnvironmentList/EnvironmentItem/EnvironmentItem.tsx b/app/portainer/home/EnvironmentList/EnvironmentItem/EnvironmentItem.tsx
index 1702e9039..b76e68b93 100644
--- a/app/portainer/home/EnvironmentList/EnvironmentItem/EnvironmentItem.tsx
+++ b/app/portainer/home/EnvironmentList/EnvironmentItem/EnvironmentItem.tsx
@@ -148,7 +148,7 @@ function useEnvironmentTagNames(tagIds?: TagId[]) {
     );
   });
 
-  if (tags) {
+  if (tags && tags.length > 0) {
     return tags.join(', ');
   }