diff --git a/lib/plausible_web/live/components/combo_box.ex b/lib/plausible_web/live/components/combo_box.ex
index bde697c70c..570b97d4ef 100644
--- a/lib/plausible_web/live/components/combo_box.ex
+++ b/lib/plausible_web/live/components/combo_box.ex
@@ -323,19 +323,19 @@ defmodule PlausibleWeb.Live.Components.ComboBox do
   defp do_select(socket, submit_value, display_value) do
     id = socket.assigns.id
 
-    display_value =
+    {final_display_value, final_submit_value} =
       if socket.assigns[:clear_on_select] do
-        ""
+        {"", ""}
       else
-        display_value
+        {display_value, submit_value}
       end
 
     socket =
       socket
-      |> push_event("update-value", %{id: id, value: display_value, fire: false})
-      |> push_event("update-value", %{id: "submit-#{id}", value: submit_value, fire: true})
-      |> assign(:display_value, display_value)
-      |> assign(:submit_value, submit_value)
+      |> push_event("update-value", %{id: id, value: final_display_value, fire: false})
+      |> push_event("update-value", %{id: "submit-#{id}", value: final_submit_value, fire: true})
+      |> assign(:display_value, final_display_value)
+      |> assign(:submit_value, final_submit_value)
 
     if socket.assigns[:on_selection_made] do
       socket.assigns.on_selection_made.(submit_value, id)