diff --git a/apps/meteor/client/views/omnichannel/directory/chats/useChatsQuery.ts b/apps/meteor/client/views/omnichannel/directory/chats/useChatsQuery.ts
index 193fd6d72aaa..494741d2d794 100644
--- a/apps/meteor/client/views/omnichannel/directory/chats/useChatsQuery.ts
+++ b/apps/meteor/client/views/omnichannel/directory/chats/useChatsQuery.ts
@@ -66,10 +66,12 @@ export const useChatsQuery = () => {
 			query.queued = status === 'queued';
 		}
 
+		if (!canViewLivechatRooms) {
+			query.agents = userIdLoggedIn ? [userIdLoggedIn] : [];
+		}
+
 		if (canViewLivechatRooms && servedBy && servedBy !== 'all') {
 			query.agents = [servedBy];
-		} else {
-			query.agents = userIdLoggedIn ? [userIdLoggedIn] : [];
 		}
 
 		if (department && department !== 'all') {