diff --git a/modules/chat/public/views/partials/inbox.liquid b/modules/chat/public/views/partials/inbox.liquid
index 17272ef..6032b15 100644
--- a/modules/chat/public/views/partials/inbox.liquid
+++ b/modules/chat/public/views/partials/inbox.liquid
@@ -107,11 +107,15 @@
           ←
         </a>
         {% liquid
-          if other_participant
-            if other_participant.first_name
-              assign name = other_participant.first_name | append: ' ' | append: other_participant.last_name
+          assign participants = current_conversation.participants
+          assign current_participants = participants | select: id: current_profile.id
+          assign other_participants = participants | subtract_array: current_participants
+          assign from_profile = other_participants | first
+          if from_profile
+            if from_profile.first_name
+              assign name = from_profile.first_name | append: ' ' | append: from_profile.last_name
             else
-              assign name = other_participant.name
+              assign name = from_profile.name
             endif
 
             render 'modules/common-styling/user/avatar', size: 's', name: name, imageSrc: other_participant.avatar.photo.versions.sm
@@ -153,4 +157,5 @@
       {{ 'modules/chat/pick_conversation' | t }}
     </div>
   {% endif %}
+
 </div>
\ No newline at end of file