diff --git a/lib/shared/thread-utils.js b/lib/shared/thread-utils.js
--- a/lib/shared/thread-utils.js
+++ b/lib/shared/thread-utils.js
@@ -232,7 +232,7 @@
 function threadOrParentThreadIsGroupChat(
   threadInfo: RawThreadInfo | ThreadInfo,
 ) {
-  return threadInfo.members.length > 2;
+  return threadMembersWithoutAddedAshoat(threadInfo).length > 2;
 }
 
 function threadIsPending(threadID: ?string): boolean {
@@ -772,9 +772,8 @@
   checkOnlyViewerBlock?: boolean,
 ): boolean {
   if (
-    threadInfo.type !== threadTypes.PERSONAL &&
-    (threadOrParentThreadIsGroupChat(threadInfo) ||
-      threadOrParentThreadHasAdminRole(threadInfo))
+    threadOrParentThreadIsGroupChat(threadInfo) ||
+    threadOrParentThreadHasAdminRole(threadInfo)
   ) {
     return false;
   }
@@ -891,7 +890,9 @@
   threadInfo: RawThreadInfo | ThreadInfo,
 ) {
   return (
-    threadInfo.members.filter(member => memberHasAdminPowers(member)).length > 0
+    threadMembersWithoutAddedAshoat(threadInfo).filter(member =>
+      memberHasAdminPowers(member),
+    ).length > 0
   );
 }