diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt
index 425f31830f..4639230be3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt
@@ -44,7 +44,6 @@ import org.thoughtcrime.securesms.megaphone.Megaphones
 import org.thoughtcrime.securesms.payments.DataExportUtil
 import org.thoughtcrime.securesms.storage.StorageSyncHelper
 import org.thoughtcrime.securesms.util.ConversationUtil
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 import java.util.Optional
@@ -600,16 +599,14 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
         }
       )
 
-      if (FeatureFlags.chatFilters()) {
-        dividerPref()
-        sectionHeaderPref(DSLSettingsText.from("Chat Filters"))
-        clickPref(
-          title = DSLSettingsText.from("Reset pull to refresh tip count"),
-          onClick = {
-            SignalStore.uiHints().resetNeverDisplayPullToRefreshCount()
-          }
-        )
-      }
+      dividerPref()
+      sectionHeaderPref(DSLSettingsText.from("Chat Filters"))
+      clickPref(
+        title = DSLSettingsText.from("Reset pull to refresh tip count"),
+        onClick = {
+          SignalStore.uiHints().resetNeverDisplayPullToRefreshCount()
+        }
+      )
 
       dividerPref()
       clickPref(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationFilterBehavior.kt b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationFilterBehavior.kt
index 4c85386fae..377656adb8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationFilterBehavior.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationFilterBehavior.kt
@@ -7,14 +7,13 @@ import android.view.View
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.view.ViewCompat
 import com.google.android.material.appbar.AppBarLayout
-import org.thoughtcrime.securesms.util.FeatureFlags
 
 class ConversationFilterBehavior(context: Context, attributeSet: AttributeSet) : AppBarLayout.Behavior(context, attributeSet) {
 
   var callback: Callback? = null
 
   override fun onStartNestedScroll(parent: CoordinatorLayout, child: AppBarLayout, directTargetChild: View, target: View, nestedScrollAxes: Int, type: Int): Boolean {
-    if (type == ViewCompat.TYPE_NON_TOUCH || !FeatureFlags.chatFilters() || callback?.canStartNestedScroll() == false) {
+    if (type == ViewCompat.TYPE_NON_TOUCH || callback?.canStartNestedScroll() == false) {
       return false
     } else {
       return super.onStartNestedScroll(parent, child, directTargetChild, target, nestedScrollAxes, type)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
index 520af3ea0e..895d78a174 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
@@ -568,8 +568,8 @@ public class ConversationListFragment extends MainFragment implements ActionMode
     ConversationFilterRequest request             = viewModel.getConversationFilterRequest();
     boolean                   isChatFilterEnabled = request != null && request.getFilter() == ConversationFilter.UNREAD;
 
-    menu.findItem(R.id.menu_filter_unread_chats).setVisible(FeatureFlags.chatFilters() && !isChatFilterEnabled);
-    menu.findItem(R.id.menu_clear_unread_filter).setVisible(FeatureFlags.chatFilters() && isChatFilterEnabled);
+    menu.findItem(R.id.menu_filter_unread_chats).setVisible(!isChatFilterEnabled);
+    menu.findItem(R.id.menu_clear_unread_filter).setVisible(isChatFilterEnabled);
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
index a95c2e06d5..92ecf2b03e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
@@ -100,7 +100,6 @@ public final class FeatureFlags {
   public  static final String CREDIT_CARD_DISABLED_REGIONS      = "global.donations.ccDisabledRegions";
   public  static final String PAYPAL_DISABLED_REGIONS           = "global.donations.paypalDisabledRegions";
   private static final String CDS_HARD_LIMIT                    = "android.cds.hardLimit";
-  private static final String CHAT_FILTERS                      = "android.chat.filters.3";
   private static final String PAYPAL_ONE_TIME_DONATIONS         = "android.oneTimePayPalDonations.2";
   private static final String PAYPAL_RECURRING_DONATIONS        = "android.recurringPayPalDonations.3";
   private static final String ANY_ADDRESS_PORTS_KILL_SWITCH     = "android.calling.fieldTrial.anyAddressPortsKillSwitch";
@@ -162,7 +161,6 @@ public final class FeatureFlags {
       CREDIT_CARD_DISABLED_REGIONS,
       PAYPAL_DISABLED_REGIONS,
       CDS_HARD_LIMIT,
-      CHAT_FILTERS,
       PAYPAL_ONE_TIME_DONATIONS,
       PAYPAL_RECURRING_DONATIONS,
       ANY_ADDRESS_PORTS_KILL_SWITCH,
@@ -558,13 +556,6 @@ public final class FeatureFlags {
     return getInteger(CDS_HARD_LIMIT, 50_000);
   }
 
-  /**
-   * Enables chat filters. Note that this UI is incomplete.
-   */
-  public static boolean chatFilters() {
-    return getBoolean(CHAT_FILTERS, false);
-  }
-
   /**
    * Whether or not we should allow PayPal payments for one-time donations
    */