diff --git a/app/views/api/v1/accounts/conversations/text_search.json.jbuilder b/app/views/api/v1/accounts/conversations/text_search.json.jbuilder
index 6572fdd64..a06df0814 100644
--- a/app/views/api/v1/accounts/conversations/text_search.json.jbuilder
+++ b/app/views/api/v1/accounts/conversations/text_search.json.jbuilder
@@ -3,7 +3,7 @@ json.payload do
     json.array! @result[:conversations] do |conversation|
       json.partial! 'api/v1/models/conversation', formats: [:json], conversation: conversation
       json.agent do
-        json.partial! 'api/v1/models/agent', formats: [:json], resource: conversation.assignee if conversation.assignee.present?
+        json.partial! 'api/v1/models/agent', formats: [:json], resource: conversation.assignee if conversation.try(:assignee).present?
       end
     end
   end
@@ -18,10 +18,16 @@ json.payload do
     json.array! @result[:messages] do |message|
       json.partial! 'api/v1/models/message', formats: [:json], message: message
       json.agent do
-        json.partial! 'api/v1/models/agent', formats: [:json], resource: message.conversation.assignee if message.conversation.assignee.present?
+        json.partial! 'api/v1/models/agent', formats: [:json], resource: message.conversation.assignee if message.conversation.try(:assignee).present?
       end
       json.inbox do
-        json.partial! 'api/v1/models/inbox', formats: [:json], resource: message.inbox if message.inbox.present?
+        if message.inbox.present?
+          inbox = message.inbox
+          json.id inbox.id
+          json.channel_id inbox.channel_id
+          json.name inbox.name
+          json.channel_type inbox.channel_type
+        end
       end
     end
   end