diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index 7ac815755..75ac69f5c 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -36,7 +36,7 @@ class Conversation < ApplicationRecord
 
   enum status: { open: 0, resolved: 1, bot: 2 }
 
-  scope :latest, -> { order(created_at: :desc) }
+  scope :latest, -> { order(updated_at: :desc) }
   scope :unassigned, -> { where(assignee_id: nil) }
   scope :assigned_to, ->(agent) { where(assignee_id: agent.id) }
 
diff --git a/app/models/message.rb b/app/models/message.rb
index 944cebabf..355b3216c 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -51,7 +51,7 @@ class Message < ApplicationRecord
 
   belongs_to :account
   belongs_to :inbox
-  belongs_to :conversation
+  belongs_to :conversation, touch: true
   belongs_to :user, required: false
   belongs_to :contact, required: false