diff --git a/app/components/chat_message/chat_message.html.erb b/app/components/chat_message/chat_message.html.erb
index d6771a947..e8e938daa 100644
--- a/app/components/chat_message/chat_message.html.erb
+++ b/app/components/chat_message/chat_message.html.erb
@@ -59,34 +59,36 @@
       <% end %>
     <% end %>
 
-    <% if image? %>
-      <% if message.text.blank? %>
+    <% unless files.empty? %>
+      <% if image? %>
+        <% if message.text.blank? %>
+          <header class="ChatMessage-header">
+            <% if message.sender %>
+              <%= c 'avatar', record: message.sender, style: :small, class: "ChatMessage-avatar" %>
+            <% else %>
+              <%= c 'avatar', style: :small, class: "ChatMessage-avatar" %>
+            <% end %>
+            <%= c 'chat_message_photos', photos: image_files %>
+          </header>
+        <% else %>
+          <%= c 'chat_message_photos', photos: image_files %>
+        <% end %>
+      <% end %>
+
+      <% if audio? %>
         <header class="ChatMessage-header">
           <% if message.sender %>
             <%= c 'avatar', record: message.sender, style: :small, class: "ChatMessage-avatar" %>
           <% else %>
             <%= c 'avatar', style: :small, class: "ChatMessage-avatar" %>
           <% end %>
-          <%= c 'chat_message_photos', photos: files %>
+          <%= c 'chat_message_audio', audios: audio_files %>
         </header>
-      <% else %>
-        <%= c 'chat_message_photos', photos: files %>
       <% end %>
-    <% end %>
-
-    <% if audio? %>
-      <header class="ChatMessage-header">
-        <% if message.sender %>
-          <%= c 'avatar', record: message.sender, style: :small, class: "ChatMessage-avatar" %>
-        <% else %>
-          <%= c 'avatar', style: :small, class: "ChatMessage-avatar" %>
-        <% end %>
-        <%= c 'chat_message_audio', audio: audio %>
-      </header>
-    <% end %>
 
-    <% if video? %>
-      <%= c 'chat_message_video', videos: files %>
+      <% if video? %>
+        <%= c 'chat_message_video', videos: video_files %>
+      <% end %>
     <% end %>
 
     <footer class="ChatMessage-footer">
diff --git a/app/components/chat_message/chat_message.rb b/app/components/chat_message/chat_message.rb
index b2fbf4aaf..38baed9c9 100644
--- a/app/components/chat_message/chat_message.rb
+++ b/app/components/chat_message/chat_message.rb
@@ -24,27 +24,35 @@ def id
     end
 
     def audio?
-      files.first.attachment.blob.audio? unless files.empty?
+      files.any? { |file| file.attachment.blob.content_type.match? /audio/ }
     end
 
     def image?
-      files.first.attachment.blob.image? unless files.empty?
+      files.any? { |file| file.attachment.blob.content_type.match? /image/ }
     end
 
     def video?
-      files.first.attachment.blob.video? unless files.empty?
+      files.any? { |file| file.attachment.blob.content_type.match? /video/ }
     end
 
     def photos
       message.photos
     end
 
+    def image_files
+      files.select { |file| file.attachment.blob.content_type.match? /image/ }
+    end
+
+    def video_files
+      files.select { |file| file.attachment.blob.content_type.match? /video/ }
+    end
+
     def files
       message.files
     end
 
-    def audio
-      files.first unless files.empty?
+    def audio_files
+      files.select { |file| file.attachment.blob.content_type.match? /audio/ }
     end
 
     def creator_name
diff --git a/app/components/chat_message_audio/chat_message_audio.html.erb b/app/components/chat_message_audio/chat_message_audio.html.erb
index 0a9b9c466..dd84495dc 100644
--- a/app/components/chat_message_audio/chat_message_audio.html.erb
+++ b/app/components/chat_message_audio/chat_message_audio.html.erb
@@ -1,6 +1,8 @@
 <div class="ChatMessageAudio">
-  <audio controls>
-    <source src="<%= url_for(audio.attachment) %>" type="audio/ogg">
-    <%= t 'components.chat_message_audio.no_audio_support' %>
-  </audio>
+  <% audios.each do |audio| %>
+    <audio controls>
+      <source src="<%= url_for(audio.attachment) %>" type="audio/ogg">
+      <%= t 'components.chat_message_audio.no_audio_support' %>
+    </audio>
+  <% end %>
 </div>
diff --git a/app/components/chat_message_audio/chat_message_audio.rb b/app/components/chat_message_audio/chat_message_audio.rb
index 48e765801..6f2a91b47 100644
--- a/app/components/chat_message_audio/chat_message_audio.rb
+++ b/app/components/chat_message_audio/chat_message_audio.rb
@@ -2,14 +2,14 @@
 
 module ChatMessageAudio
   class ChatMessageAudio < ApplicationComponent
-    def initialize(audio:, **)
+    def initialize(audios:, **)
       super
 
-      @audio = audio
+      @audios = audios
     end
 
     private
 
-    attr_reader :audio
+    attr_reader :audios
   end
 end
diff --git a/spec/components/chat_message_voice_spec.rb b/spec/components/chat_message_voice_spec.rb
index 9b5fcabf2..56c99c164 100644
--- a/spec/components/chat_message_voice_spec.rb
+++ b/spec/components/chat_message_voice_spec.rb
@@ -5,7 +5,7 @@
 RSpec.describe ChatMessageAudio::ChatMessageAudio, type: :component do
   subject { render_inline(described_class.new(**params)) }
 
-  let(:audio) { create(:file) }
-  let(:params) { { audio: audio } }
+  let(:audios) { [create(:file)] }
+  let(:params) { { audios: audios } }
   it { should have_css('.ChatMessageAudio') }
 end