diff --git a/ts/components/ConversationListItem.tsx b/ts/components/ConversationListItem.tsx
index 72254409c..686fb4a36 100644
--- a/ts/components/ConversationListItem.tsx
+++ b/ts/components/ConversationListItem.tsx
@@ -163,6 +163,7 @@ export class ConversationListItem extends React.PureComponent<Props> {
       isRss,
       isPublic,
       hasNickname,
+      type,
       onDeleteContact,
       onDeleteMessages,
       onBlockContact,
@@ -174,10 +175,11 @@ export class ConversationListItem extends React.PureComponent<Props> {
 
     const blockTitle = isBlocked ? i18n('unblockUser') : i18n('blockUser');
     const blockHandler = isBlocked ? onUnblockContact : onBlockContact;
+    const isPrivate = type === 'direct';
 
     return (
       <ContextMenu id={triggerId}>
-        {!isPublic && !isRss && !isMe ? (
+        {!isPublic && !isRss && !isMe && isPrivate ? (
           <MenuItem onClick={blockHandler}>{blockTitle}</MenuItem>
         ) : null}
         {/* {!isPublic && !isRss && !isMe ? (
diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index 8b1cb57ed..8a66cf64a 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -480,7 +480,7 @@ export class ConversationHeader extends React.Component<Props> {
     const resetSessionMenuItem = !isGroup && (
       <MenuItem onClick={onResetSession}>{i18n('resetSession')}</MenuItem>
     );
-    const blockHandlerMenuItem = !isMe && !isRss && (
+    const blockHandlerMenuItem = !isMe && !isRss && !isGroup && (
       <MenuItem onClick={blockHandler}>{blockTitle}</MenuItem>
     );