diff --git a/src/libclient/conversationmodel.cpp b/src/libclient/conversationmodel.cpp
index 8ca0d219d85bbe7b493cd773f1a7953f0948d44b..fa0331bd9c1ca8100d85e8b3957dac58e44447aa 100644
--- a/src/libclient/conversationmodel.cpp
+++ b/src/libclient/conversationmodel.cpp
@@ -1237,7 +1237,9 @@ ConversationModel::avatar(const QString& conversationId) const
         // In this case, we can just display contact name
         return owner.contactModel->avatar(peer.at(0));
     }
-    return conversation.infos["avatar"];
+    // We need to strip the whitespace characters for the avatar
+    // when it comes from the conversation info.
+    return conversation.infos["avatar"].simplified();
 }
 
 void