diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index d139cbed6..e49d28380 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -289,6 +289,7 @@
             window.storage.get('primaryDevicePubKey')
           ),
           isKickedFromGroup: this.model.get('isKickedFromGroup'),
+          isBlocked: this.model.isBlocked(),
 
           timerOptions: Whisper.ExpirationTimerOptions.map(item => ({
             name: item.getName(),
diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index caf1a77f5..2d5816d39 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -454,7 +454,7 @@ export class ConversationHeader extends React.Component<Props> {
     const blockTitle = isBlocked ? i18n('unblockUser') : i18n('blockUser');
     const blockHandler = isBlocked ? onUnblockUser : onBlockUser;
 
-    const disappearingMessagesMenuItem = !isKickedFromGroup && (
+    const disappearingMessagesMenuItem = !isKickedFromGroup && !isBlocked && (
       <SubMenu title={disappearingTitle}>
         {(timerOptions || []).map(item => (
           <MenuItem
diff --git a/ts/components/session/SessionGroupSettings.tsx b/ts/components/session/SessionGroupSettings.tsx
index d5b25fb2d..75dd1387f 100644
--- a/ts/components/session/SessionGroupSettings.tsx
+++ b/ts/components/session/SessionGroupSettings.tsx
@@ -22,6 +22,7 @@ interface Props {
   isAdmin: boolean;
   amMod: boolean;
   isKickedFromGroup: boolean;
+  isBlocked: boolean;
 
   onGoBack: () => void;
   onInviteContacts: () => void;
@@ -215,10 +216,12 @@ export class SessionGroupSettings extends React.Component<Props, any> {
       isAdmin,
       isKickedFromGroup,
       amMod,
+      isBlocked,
     } = this.props;
     const { documents, media, onItemClick } = this.state;
     const showMemberCount = !!(memberCount && memberCount > 0);
-    const hasDisappearingMessages = !isPublic && !isKickedFromGroup;
+    const hasDisappearingMessages =
+      !isPublic && !isKickedFromGroup && !isBlocked;
     const leaveGroupString = isPublic
       ? window.i18n('leaveOpenGroup')
       : isKickedFromGroup
@@ -235,9 +238,11 @@ export class SessionGroupSettings extends React.Component<Props, any> {
     });
 
     const showUpdateGroupNameButton =
-      isPublic && !isKickedFromGroup ? amMod : isAdmin;
+      isPublic && !isKickedFromGroup
+        ? amMod && !isBlocked
+        : isAdmin && !isBlocked;
     const showUpdateGroupMembersButton =
-      !isPublic && !isKickedFromGroup && isAdmin;
+      !isPublic && !isKickedFromGroup && !isBlocked && isAdmin;
 
     return (
       <div className="group-settings">
@@ -313,9 +318,11 @@ export class SessionGroupSettings extends React.Component<Props, any> {
       isAdmin,
       isPublic,
       isKickedFromGroup,
+      isBlocked,
     } = this.props;
 
-    const showInviteContacts = (isPublic || isAdmin) && !isKickedFromGroup;
+    const showInviteContacts =
+      (isPublic || isAdmin) && !isKickedFromGroup && !isBlocked;
 
     return (
       <div className="group-settings-header">