diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index c603edb4d..5f58a8a0b 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -111,7 +111,8 @@ class Attachment < ApplicationRecord
       id: id,
       message_id: message_id,
       file_type: file_type,
-      account_id: account_id
+      account_id: account_id,
+      meta: meta || {}
     }
   end
 
diff --git a/app/services/whatsapp/incoming_message_baileys_service.rb b/app/services/whatsapp/incoming_message_baileys_service.rb
index e18139002..a39b59591 100644
--- a/app/services/whatsapp/incoming_message_baileys_service.rb
+++ b/app/services/whatsapp/incoming_message_baileys_service.rb
@@ -105,8 +105,7 @@ class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseSer
     when 'reaction'
       create_message if message_content.present?
     when 'image', 'file', 'video', 'audio', 'sticker'
-      create_message
-      attach_media
+      create_message(attach_media: true)
     when 'unsupported'
       create_unsupported_message
       Rails.logger.warn "Baileys unsupported message type: #{message_type}"
@@ -152,12 +151,12 @@ class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseSer
     'unsupported'
   end
 
-  def create_message
+  def create_message(attach_media: false)
     sender = incoming? ? @contact : @inbox.account.account_users.first.user
     sender_type = incoming? ? 'Contact' : 'User'
     message_type = incoming? ? :incoming : :outgoing
 
-    @message = @conversation.messages.create!(
+    @message = @conversation.messages.build(
       content: message_content,
       account_id: @inbox.account_id,
       inbox_id: @inbox.id,
@@ -167,6 +166,10 @@ class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseSer
       message_type: message_type,
       content_attributes: message_content_attributes
     )
+
+    handle_attach_media if attach_media
+
+    @message.save!
   end
 
   def message_content_attributes
@@ -191,7 +194,7 @@ class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseSer
     )
   end
 
-  def attach_media
+  def handle_attach_media
     media = processed_params.dig(:extra, :media)
     return if media.blank?
 
@@ -201,20 +204,15 @@ class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseSer
       raise AttachmentNotFoundError
     end
 
-    begin
-      decoded_data = Base64.decode64(attachment_payload)
-      io = StringIO.new(decoded_data)
+    decoded_data = Base64.decode64(attachment_payload)
+    io = StringIO.new(decoded_data)
 
-      @message.attachments.new(
-        account_id: @message.account_id,
-        file_type: file_content_type.to_s,
-        file: { io: io, filename: filename }
-      )
-
-      @message.save!
-    rescue StandardError => e
-      Rails.logger.error "Failed to attach media for message #{message_id} (#{e.message}) payload: #{attachment_payload}"
-    end
+    attachment = @message.attachments.build(
+      account_id: @message.account_id,
+      file_type: file_content_type.to_s,
+      file: { io: io, filename: filename }
+    )
+    attachment.meta = { is_recorded_audio: true } if @raw_message.dig(:message, :audioMessage, :ptt)
   end
 
   def file_content_type
@@ -229,7 +227,7 @@ class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseSer
     filename = @raw_message.dig(:message, :documentMessage, :fileName)
     return filename if filename.present?
 
-    "#{file_content_type}_#{@message[:id]}_#{Time.current.strftime('%Y%m%d')}"
+    "#{file_content_type}_#{message_id}_#{Time.current.strftime('%Y%m%d')}"
   end
 
   def message_content
diff --git a/spec/services/whatsapp/incoming_message_baileys_service_spec.rb b/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
index ff7ea92db..a54fed37f 100644
--- a/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
+++ b/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
@@ -487,7 +487,7 @@ describe Whatsapp::IncomingMessageBaileysService do
           expect(attachment.file).to be_present
           expect(attachment.file_type).to eq('image')
 
-          expect(attachment.file.filename.to_s).to eq("image_#{message.id}_#{Time.current.strftime('%Y%m%d')}")
+          expect(attachment.file.filename.to_s).to eq("image_msg_123_#{Time.current.strftime('%Y%m%d')}")
           expect(attachment.file.content_type).to eq('image/png')
         end
       end
@@ -538,7 +538,7 @@ describe Whatsapp::IncomingMessageBaileysService do
           expect(attachment.file).to be_present
           expect(attachment.file_type).to eq('video')
 
-          expect(attachment.file.filename.to_s).to eq("video_#{message.id}_#{Time.current.strftime('%Y%m%d')}")
+          expect(attachment.file.filename.to_s).to eq("video_msg_123_#{Time.current.strftime('%Y%m%d')}")
           expect(attachment.file.content_type).to eq('video/mp4')
         end
       end
@@ -621,7 +621,7 @@ describe Whatsapp::IncomingMessageBaileysService do
           expect(attachment.file_type).to eq('audio')
           expect(attachment.file).to be_present
 
-          expect(attachment.file.filename.to_s).to eq("audio_#{message.id}_#{Time.current.strftime('%Y%m%d')}")
+          expect(attachment.file.filename.to_s).to eq("audio_msg_123_#{Time.current.strftime('%Y%m%d')}")
           expect(attachment.file.content_type).to eq('audio/opus')
         end
       end
@@ -663,7 +663,7 @@ describe Whatsapp::IncomingMessageBaileysService do
           expect(attachment.file_type).to eq('image')
           expect(attachment.file).to be_present
 
-          expect(attachment.file.filename.to_s).to eq("image_#{message.id}_#{Time.current.strftime('%Y%m%d')}")
+          expect(attachment.file.filename.to_s).to eq("image_msg_123_#{Time.current.strftime('%Y%m%d')}")
           expect(attachment.file.content_type).to eq('image/png')
         end
       end