diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationHeaderView.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationHeaderView.java
index d0ad721539d..a35ed1d663a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationHeaderView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationHeaderView.java
@@ -14,6 +14,7 @@
 import androidx.core.content.ContextCompat;
 
 import org.signal.core.util.DimensionUnit;
+import org.signal.core.util.StringUtil;
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.emoji.EmojiTextView;
@@ -94,17 +95,22 @@ public void setAbout(@NonNull Recipient recipient) {
   }
 
   public void setSubtitle(@NonNull CharSequence subtitle, @DrawableRes int iconRes) {
+    if (TextUtils.isEmpty(subtitle)) {
+      hideSubtitle();
+      return;
+    }
+
     binding.messageRequestSubtitle.setText(prependIcon(subtitle, iconRes));
     binding.messageRequestSubtitle.setVisibility(View.VISIBLE);
   }
 
   public void setDescription(@Nullable CharSequence description, @DrawableRes int iconRes) {
-    if (description == null) {
+    if (TextUtils.isEmpty(description)) {
       hideDescription();
       return;
     }
 
-    binding.messageRequestSubtitle.setText(prependIcon(description, iconRes));
+    binding.messageRequestDescription.setText(prependIcon(description, iconRes));
     binding.messageRequestDescription.setVisibility(View.VISIBLE);
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2.kt
index 31ef315a0f3..5da169ca304 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2.kt
@@ -622,7 +622,6 @@ class ConversationAdapterV2(
           }
         }
         conversationBanner.setDescription(HtmlCompat.fromHtml(description, 0), R.drawable.symbol_group_light_20)
-        conversationBanner.showDescription()
       }
 
       if (recipient.isReleaseNotes) {