diff --git a/lib/plausible/stats/query.ex b/lib/plausible/stats/query.ex
index 9c50c0cfb71b..3a5ba04d8901 100644
--- a/lib/plausible/stats/query.ex
+++ b/lib/plausible/stats/query.ex
@@ -31,8 +31,7 @@ defmodule Plausible.Stats.Query do
             # Contains information to determine how to combine legacy and new time on page metrics
             time_on_page_data: %{},
             sql_join_type: :left,
-            smear_session_metrics: false,
-            optimize_name_filter?: true
+            smear_session_metrics: false
 
   require OpenTelemetry.Tracer, as: Tracer
 
diff --git a/lib/plausible/stats/query_builder.ex b/lib/plausible/stats/query_builder.ex
index c7e882509a9c..05c91c65f272 100644
--- a/lib/plausible/stats/query_builder.ex
+++ b/lib/plausible/stats/query_builder.ex
@@ -182,8 +182,7 @@ defmodule Plausible.Stats.QueryBuilder do
       preloaded_goals: preloaded_goals,
       revenue_warning: revenue_warning,
       revenue_currencies: revenue_currencies,
-      debug_metadata: debug_metadata,
-      optimize_name_filter?: FunWithFlags.enabled?(:optimize_name_filter, for: site)
+      debug_metadata: debug_metadata
     )
   end
 
diff --git a/lib/plausible/stats/sql/query_builder.ex b/lib/plausible/stats/sql/query_builder.ex
index 8520c2e8c5cc..777056bf37c2 100644
--- a/lib/plausible/stats/sql/query_builder.ex
+++ b/lib/plausible/stats/sql/query_builder.ex
@@ -36,7 +36,7 @@ defmodule Plausible.Stats.SQL.QueryBuilder do
       from(
         e in "events_v2",
         where: ^SQL.WhereBuilder.build(:events, events_query),
-        where: ^maybe_derived_name_filter(events_query),
+        where: ^derived_name_filter(events_query),
         select: ^select_event_metrics(events_query)
       )
 
@@ -130,12 +130,6 @@ defmodule Plausible.Stats.SQL.QueryBuilder do
     end
   end
 
-  defp maybe_derived_name_filter(%{optimize_name_filter?: true} = events_query) do
-    derived_name_filter(events_query)
-  end
-
-  defp maybe_derived_name_filter(_events_query), do: true
-
   defp derived_name_filter(events_query) do
     cond do
       goal_breakdown?(events_query) ->