diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 3e820ef37f..1a970cfdcd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -246,7 +246,6 @@ import org.whispersystems.libsignal.util.guava.Optional;
 
 import java.io.IOException;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.concurrent.ExecutionException;
@@ -708,6 +707,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     GroupActiveState groupActiveState = groupViewModel.getGroupActiveState().getValue();
     boolean isActiveGroup             = groupActiveState != null && groupActiveState.isActiveGroup();
     boolean isActiveV2Group           = groupActiveState != null && groupActiveState.isActiveV2Group();
+    boolean isInActiveGroup           = groupActiveState != null && !groupActiveState.isActiveGroup();
 
     if (isInMessageRequest()) {
       if (isActiveGroup) {
@@ -725,10 +725,14 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
     if (isSecureText) {
       if (recipient.get().getExpireMessages() > 0) {
-        inflater.inflate(R.menu.conversation_expiring_on, menu);
+        if (!isInActiveGroup) {
+          inflater.inflate(R.menu.conversation_expiring_on, menu);
+        }
         titleView.showExpiring(recipient);
       } else {
-        inflater.inflate(R.menu.conversation_expiring_off, menu);
+        if (!isInActiveGroup) {
+          inflater.inflate(R.menu.conversation_expiring_off, menu);
+        }
         titleView.clearExpiring();
       }
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupFragment.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupFragment.java
index ac5cba2d1d..6a0c95c2c6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupFragment.java
@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.groups.ui.managegroup;
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
@@ -48,7 +47,6 @@ import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.recipients.ui.bottomsheet.RecipientBottomSheetDialogFragment;
 import org.thoughtcrime.securesms.util.DateUtils;
 import org.thoughtcrime.securesms.util.LifecycleCursorWrapper;
-import org.thoughtcrime.securesms.util.ThemeUtil;
 
 import java.util.List;
 import java.util.Locale;
@@ -191,7 +189,12 @@ public class ManageGroupFragment extends Fragment {
     toolbar.setOnMenuItemClickListener(this::onMenuItemSelected);
     toolbar.inflateMenu(R.menu.manage_group_fragment);
 
-    viewModel.getCanEditGroupAttributes().observe(getViewLifecycleOwner(), canEdit -> toolbar.getMenu().findItem(R.id.action_edit).setVisible(canEdit));
+    viewModel.getCanEditGroupAttributes().observe(getViewLifecycleOwner(), canEdit -> {
+      toolbar.getMenu().findItem(R.id.action_edit).setVisible(canEdit);
+      disappearingMessages.setEnabled(canEdit);
+      disappearingMessagesRow.setEnabled(canEdit);
+    });
+
     viewModel.getTitle().observe(getViewLifecycleOwner(), groupName::setText);
     viewModel.getMemberCountSummary().observe(getViewLifecycleOwner(), memberCountUnderAvatar::setText);
     viewModel.getFullMemberCountSummary().observe(getViewLifecycleOwner(), memberCountAboveList::setText);
@@ -257,7 +260,6 @@ public class ManageGroupFragment extends Fragment {
       editGroupAccessValue.setEnabled(admin);
     });
 
-    viewModel.getCanEditGroupAttributes().observe(getViewLifecycleOwner(), canEdit -> disappearingMessages.setEnabled(canEdit));
     viewModel.getCanAddMembers().observe(getViewLifecycleOwner(), canEdit -> addMembers.setVisibility(canEdit ? View.VISIBLE : View.GONE));
 
     groupMemberList.setRecipientClickListener(recipient -> RecipientBottomSheetDialogFragment.create(recipient.getId(), groupId).show(requireFragmentManager(), "BOTTOM"));