diff --git a/app/src/pages/common/membersPage/userNameCell/userNameCell.jsx b/app/src/pages/common/membersPage/userNameCell/userNameCell.jsx
index 07eb6a6ee4..258619110a 100644
--- a/app/src/pages/common/membersPage/userNameCell/userNameCell.jsx
+++ b/app/src/pages/common/membersPage/userNameCell/userNameCell.jsx
@@ -32,30 +32,31 @@ export const UserNameCell = ({ user, badges }) => {
     <div className={cx('user-name-cell')}>
       <UserAvatar className={cx('user-avatar')} userId={user.id} thumbnail />
       <div className={cx('name-badge-wrapper')}>
-        {' '}
         <div className={cx('full-name')}>{user.fullName}</div>
-        <div className={cx('badges')}>
-          {badges.map(({ title, type }) => {
-            const badgeContent = (
-              <div key={`${user.id}-${type}`} className={cx('badge', type)}>
-                {formatMessage(title)}
-              </div>
-            );
+        {badges.length > 0 && (
+          <div className={cx('badges')}>
+            {badges.map(({ title, type }) => {
+              const badgeContent = (
+                <div key={`${user.id}-${type}`} className={cx('badge', type)}>
+                  {formatMessage(title)}
+                </div>
+              );
 
-            return type === ADMIN_TYPE ? (
-              <Tooltip
-                key={`${user.id}-${type}-tooltip`}
-                content={formatMessage(messages.adminAccessInfo)}
-                placement="top"
-                width={248}
-              >
-                {badgeContent}
-              </Tooltip>
-            ) : (
-              badgeContent
-            );
-          })}
-        </div>
+              return type === ADMIN_TYPE ? (
+                <Tooltip
+                  key={`${user.id}-${type}-tooltip`}
+                  content={formatMessage(messages.adminAccessInfo)}
+                  placement="top"
+                  width={248}
+                >
+                  {badgeContent}
+                </Tooltip>
+              ) : (
+                badgeContent
+              );
+            })}
+          </div>
+        )}
       </div>
     </div>
   );
diff --git a/app/src/pages/common/membersPage/userNameCell/userNameCell.scss b/app/src/pages/common/membersPage/userNameCell/userNameCell.scss
index 451de82656..30ff3443dc 100644
--- a/app/src/pages/common/membersPage/userNameCell/userNameCell.scss
+++ b/app/src/pages/common/membersPage/userNameCell/userNameCell.scss
@@ -39,7 +39,6 @@
     text-overflow: ellipsis;
     white-space: nowrap;
     overflow: hidden;
-    min-width: 0;
   }
 
   .badges {