diff --git a/app/api/rocket-chat/messages/route.ts b/app/api/rocket-chat/messages/route.ts
index 6f7a03e1..8c5c7713 100644
--- a/app/api/rocket-chat/messages/route.ts
+++ b/app/api/rocket-chat/messages/route.ts
@@ -110,11 +110,15 @@ export async function GET() {
           
           if (messagesData.messages && messagesData.messages.length > 0) {
             const message = messagesData.messages[0];
-            return {
-              ...message,
-              roomName: subscription.fname || subscription.name || 'Direct Message',
-              roomType: subscription.t,
-            };
+            // Only include messages where the user is either the sender or the recipient
+            if (message.u._id === rocketChatUserId || 
+                (subscription.t === 'd' && subscription.rid.includes(rocketChatUserId))) {
+              return {
+                ...message,
+                roomName: subscription.fname || subscription.name || 'Direct Message',
+                roomType: subscription.t,
+              };
+            }
           }
           
           console.log('No messages found for room:', subscription.rid);