diff --git a/js/models/conversations.js b/js/models/conversations.js
index a3151c0ba3..98364b7865 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -2019,7 +2019,9 @@
       return migrateColor(this.get('color'));
     },
     getAvatarPath() {
-      const avatar = this.get('avatar') || this.get('profileAvatar');
+      const avatar = this.isMe()
+        ? this.get('profileAvatar') || this.get('avatar')
+        : this.get('avatar') || this.get('profileAvatar');
 
       if (avatar && avatar.path) {
         return getAbsoluteAttachmentPath(avatar.path);