diff --git a/app/services/internal/remove_orphan_conversations_service.rb b/app/services/internal/remove_orphan_conversations_service.rb
index c52d6082b..ee565b003 100644
--- a/app/services/internal/remove_orphan_conversations_service.rb
+++ b/app/services/internal/remove_orphan_conversations_service.rb
@@ -25,7 +25,7 @@ class Internal::RemoveOrphanConversationsService
 
   def build_orphan_conversations_query
     base = @account ? @account.conversations : Conversation.all
-    base = base.where('conversations.created_at > ?', @days.days.ago)
+    base = base.where('conversations.last_activity_at > ?', @days.days.ago)
     base = base.left_outer_joins(:contact, :inbox)
 
     # Find conversations whose associated contact or inbox record is missing
diff --git a/lib/tasks/ops/cleanup_orphan_conversations.rake b/lib/tasks/ops/cleanup_orphan_conversations.rake
index 20cb207d6..481eb3bc3 100644
--- a/lib/tasks/ops/cleanup_orphan_conversations.rake
+++ b/lib/tasks/ops/cleanup_orphan_conversations.rake
@@ -20,7 +20,7 @@ namespace :chatwoot do
       # Preview count using the same query logic
       base = account
              .conversations
-             .where('conversations.created_at > ?', days.days.ago)
+             .where('conversations.last_activity_at > ?', days.days.ago)
              .left_outer_joins(:contact, :inbox)
       conversations = base.where(contacts: { id: nil }).or(base.where(inboxes: { id: nil }))