diff --git a/app/helpers/filters_helper.rb b/app/helpers/filters_helper.rb
index 605bfa443..7b5f5e51f 100644
--- a/app/helpers/filters_helper.rb
+++ b/app/helpers/filters_helper.rb
@@ -34,6 +34,6 @@ module FiltersHelper
   def any_filters?(filter)
     filter.tags.any? || filter.assignees.any? || filter.creators.any? ||
       filter.stages.any? || filter.terms.any? || filter.card_ids&.any? ||
-      filter.assignment_status.unassigned?
+      filter.assignment_status.unassigned? || !filter.indexed_by.latest?
   end
 end
diff --git a/app/views/filters/_indexed_by.html.erb b/app/views/filters/_indexed_by.html.erb
index 5fbe85a9a..b05f41557 100644
--- a/app/views/filters/_indexed_by.html.erb
+++ b/app/views/filters/_indexed_by.html.erb
@@ -1,40 +1,32 @@
-<div class="quick-filter position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
-  <button class="btn input input--select flex-inline txt-small" data-action="click->dialog#open:stop">
-    <span class="overflow-ellipsis">
-      <%= filter.indexed_by.humanize %>
-    </span>
-  </button>
+<% if !filter.indexed_by.latest? %>
+  <div class="quick-filter position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
+    <button class="btn input input--select flex-inline txt-small" data-action="click->dialog#open:stop">
+      <span class="overflow-ellipsis">
+        <%= filter.indexed_by.humanize %>
+      </span>
+    </button>
 
-  <dialog class="events__popup popup panel flex-column align-start gap-half fill-white shadow"
-      aria-label="Sort by…" aria-description="Sort by…"
-      data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
-    <strong class="popup__title margin-block-start-half pad-inline-half">Sort by…</strong>
-    <%= form_with url: cards_path, method: :get, class: "flex flex-column full-width popup__list",
-          data: { controller: "form" } do |form| %>
-      <% filter.as_params.except(:indexed_by).each do |key, value| %>
-        <%= filter_hidden_field_tag key, value %>
+    <dialog class="events__popup popup panel flex-column align-start gap-half fill-white shadow"
+        aria-label="Sort by…" aria-description="Sort by…"
+        data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
+      <strong class="popup__title margin-block-start-half pad-inline-half">Sort by…</strong>
+      <%= form_with url: cards_path, method: :get, class: "flex flex-column full-width popup__list",
+            data: { controller: "form" } do |form| %>
+        <% filter.as_params.except(:indexed_by).each do |key, value| %>
+          <%= filter_hidden_field_tag key, value %>
+        <% end %>
+
+        <% Filter::INDEXES.each do |index| %>
+          <div class="btn popup__item">
+            <%= form.radio_button :indexed_by, index,
+                checked: filter.indexed_by == index,
+                data: { action: "change->form#submit" } %>
+
+            <%= form.label :indexed_by, index.humanize, value: index, class: "overflow-ellipsis" %>
+            <%= icon_tag "check", class: "checked flex-item-justify-end" %>
+          </div>
+        <% end %>
       <% end %>
-
-      <div class="btn popup__item">
-        <%= form.radio_button :indexed_by, filter.default_indexed_by,
-            checked: filter.default_indexed_by?,
-            class: "default-value",
-            data: { action: "change->form#submit" } %>
-
-        <%= form.label :indexed_by, "Most active", value: filter.default_indexed_by, class: "overflow-ellipsis" %>
-        <%= icon_tag "check", class: "checked flex-item-justify-end" %>
-      </div>
-
-      <% Filter::INDEXES.each do |index| %>
-        <div class="btn popup__item">
-          <%= form.radio_button :indexed_by, index,
-              checked: filter.indexed_by == index,
-              data: { action: "change->form#submit" } %>
-
-          <%= form.label :indexed_by, index.humanize, value: index, class: "overflow-ellipsis" %>
-          <%= icon_tag "check", class: "checked flex-item-justify-end" %>
-        </div>
-      <% end %>
-    <% end %>
-  </dialog>
-</div>
+    </dialog>
+  </div>
+<% end %>
diff --git a/app/views/filters/_settings.html.erb b/app/views/filters/_settings.html.erb
index 3e87e78a9..5505f7a22 100644
--- a/app/views/filters/_settings.html.erb
+++ b/app/views/filters/_settings.html.erb
@@ -5,6 +5,7 @@
     <%= render "filters/creators", filter: filter %>
     <%= render "filters/stages", filter: filter %>
     <%= render "filters/cards", filter: filter %>
+    <%= render "filters/indexed_by", filter: filter %>
 
     <% filter.terms.each do |term| %>
       <%= filter_chip_tag %Q("#{term}"), filter.as_params_without(:terms, term) %>