diff --git a/src/messages/messages.service.ts b/src/messages/messages.service.ts
index 84508bb..81caaa8 100644
--- a/src/messages/messages.service.ts
+++ b/src/messages/messages.service.ts
@@ -358,7 +358,11 @@ export class MessagesService {
             orderBy: { createdAt: 'desc' },
           },
         },
-        orderBy: { lastMessageAt: 'desc' },
+        // Starred conversations pin to the top; remaining rows use last-activity.
+        orderBy: [
+          { agentFavorited: 'desc' },
+          { lastMessageAt: 'desc' },
+        ],
       });
 
       // Map to include unread count from agent perspective
@@ -410,7 +414,10 @@ export class MessagesService {
             orderBy: { createdAt: 'desc' },
           },
         },
-        orderBy: { lastMessageAt: 'desc' },
+        orderBy: [
+          { userFavorited: 'desc' },
+          { lastMessageAt: 'desc' },
+        ],
       });
 
       // Map to include unread count from user perspective