diff --git a/enterprise/app/services/voice/call_message_builder.rb b/enterprise/app/services/voice/call_message_builder.rb
index e5157a57a..722ad78d1 100644
--- a/enterprise/app/services/voice/call_message_builder.rb
+++ b/enterprise/app/services/voice/call_message_builder.rb
@@ -8,26 +8,18 @@ class Voice::CallMessageBuilder
   end
 
   def perform!
-    find_message || create_message!
+    call.message || create_message!
   end
 
   private
 
   attr_reader :call
 
-  def find_message
-    return call.message if call.message_id.present?
-
-    call.conversation.messages.voice_calls
-        .find_by("content_attributes -> 'data' ->> 'call_sid' = ?", call.provider_call_id)
-  end
-
   def create_message!
     params = {
       content: 'Voice Call',
       message_type: call.outgoing? ? 'outgoing' : 'incoming',
-      content_type: 'voice_call',
-      content_attributes: { 'data' => { 'call_sid' => call.provider_call_id } }
+      content_type: 'voice_call'
     }
     Messages::MessageBuilder.new(sender, call.conversation, params).perform
   end
diff --git a/spec/enterprise/services/voice/inbound_call_builder_spec.rb b/spec/enterprise/services/voice/inbound_call_builder_spec.rb
index 6256b225f..7af9be8e6 100644
--- a/spec/enterprise/services/voice/inbound_call_builder_spec.rb
+++ b/spec/enterprise/services/voice/inbound_call_builder_spec.rb
@@ -48,7 +48,6 @@ RSpec.describe Voice::InboundCallBuilder do
         expect(voice_message).to be_present
         expect(voice_message.message_type).to eq('incoming')
         expect(call.message_id).to eq(voice_message.id)
-        expect(voice_message.content_attributes['data']['call_sid']).to eq(call_sid)
         expect(voice_message.call).to eq(call)
       end
     end
diff --git a/spec/enterprise/services/voice/outbound_call_builder_spec.rb b/spec/enterprise/services/voice/outbound_call_builder_spec.rb
index a16ee6e72..796afe715 100644
--- a/spec/enterprise/services/voice/outbound_call_builder_spec.rb
+++ b/spec/enterprise/services/voice/outbound_call_builder_spec.rb
@@ -40,7 +40,6 @@ RSpec.describe Voice::OutboundCallBuilder do
         voice_message = call.conversation.messages.voice_calls.last
         expect(call.message_id).to eq(voice_message.id)
         expect(voice_message.message_type).to eq('outgoing')
-        expect(voice_message.content_attributes['data']['call_sid']).to eq(call_sid)
         expect(voice_message.call).to eq(call)
       end
     end