diff --git a/app/lib/rocketchat.js b/app/lib/rocketchat.js
index 5333f28e3..098717d26 100644
--- a/app/lib/rocketchat.js
+++ b/app/lib/rocketchat.js
@@ -573,9 +573,9 @@ const RocketChat = {
 		).fetch();
 
 		if (filterUsers && !filterRooms) {
-			data = data.filter(item => item.t === 'd');
+			data = data.filter(item => item.t === 'd' && !RocketChat.isGroupChat(item));
 		} else if (!filterUsers && filterRooms) {
-			data = data.filter(item => item.t !== 'd');
+			data = data.filter(item => item.t !== 'd' || RocketChat.isGroupChat(item));
 		}
 		data = data.slice(0, 7);