diff --git a/src/components/Avatar/Avatar.vue b/src/components/Avatar/Avatar.vue
index 4388efcea0..45fda75be9 100644
--- a/src/components/Avatar/Avatar.vue
+++ b/src/components/Avatar/Avatar.vue
@@ -254,7 +254,9 @@ export default {
 	},
 	computed: {
 		canDisplayUserStatus() {
-			return this.showUserStatus && this.hasStatus
+			return this.showUserStatus
+				&& this.hasStatus
+				&& ['online', 'away', 'dnd'].includes(this.userStatus.status)
 		},
 		getUserIdentifier() {
 			if (this.isDisplayNameDefined) {
@@ -570,9 +572,6 @@ export default {
 			@include iconfont('user-status-away');
 			color: #f4a331;
 		}
-		&--offline{
-			@include iconfont('user-status-invisible');
-		}
 	}
 
 	.popovermenu-wrapper {