diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
index 93adfd643..b2dec3d85 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
@@ -373,14 +373,13 @@ public class ConversationActivity extends BriarActivity
 		// enable alias action if available
 		observeOnce(viewModel.getContactItem(), this, contact ->
 				menu.findItem(R.id.action_set_alias).setEnabled(true));
-		// show auto-delete timer setting only, if contacts supports it
+		// Show auto-delete menu item if feature is enabled
 		if (featureFlags.shouldEnableDisappearingMessages()) {
-			observeOnce(viewModel.getPrivateMessageFormat(), this, format -> {
-				boolean visible = format == TEXT_IMAGES_AUTO_DELETE;
-				MenuItem item =
-						menu.findItem(R.id.action_conversation_settings);
-				item.setVisible(visible);
-			});
+			MenuItem item = menu.findItem(R.id.action_conversation_settings);
+			item.setVisible(true);
+			// Enable menu item only if contact supports auto-delete
+			observeOnce(viewModel.getPrivateMessageFormat(), this, format ->
+					item.setEnabled(format == TEXT_IMAGES_AUTO_DELETE));
 		}
 
 		return super.onCreateOptionsMenu(menu);