diff --git a/src/friend.cpp b/src/friend.cpp
index 671d2a397..df47d24ca 100644
--- a/src/friend.cpp
+++ b/src/friend.cpp
@@ -99,6 +99,11 @@ QString Friend::getDisplayedName() const
     return userAlias;
 }
 
+bool Friend::hasAlias() const
+{
+    return !userAlias.isEmpty();
+}
+
 const ToxId &Friend::getToxId() const
 {
     return userID;
diff --git a/src/friend.h b/src/friend.h
index 5213db341..667531235 100644
--- a/src/friend.h
+++ b/src/friend.h
@@ -43,6 +43,7 @@ public:
     void setName(QString name);
     void setAlias(QString name);
     QString getDisplayedName() const;
+    bool hasAlias() const;
 
     void setStatusMessage(QString message);
 
diff --git a/src/group.cpp b/src/group.cpp
index 893d08b32..b8a9e5321 100644
--- a/src/group.cpp
+++ b/src/group.cpp
@@ -76,7 +76,7 @@ void Group::updatePeer(int peerId, QString name)
     peers[peerId] = name;
     toxids[toxid] = name;
     Friend *f = FriendList::findFriend(id);
-    if (f)
+    if (f && f->hasAlias())
     {
         peers[peerId] = f->getDisplayedName();
         toxids[toxid] = f->getDisplayedName();