diff --git a/lib/music_library_web/components/scrobble_rule_picker.ex b/lib/music_library_web/components/scrobble_rule_picker.ex
index 5ec8d6e6..b6bc7a45 100644
--- a/lib/music_library_web/components/scrobble_rule_picker.ex
+++ b/lib/music_library_web/components/scrobble_rule_picker.ex
@@ -138,9 +138,9 @@ defmodule MusicLibraryWeb.ScrobbleRulePicker do
     {:ok,
      socket
      |> assign(assigns)
-     |> assign(:query, "")
-     |> assign(:collected_results, [])
-     |> assign(:wishlisted_results, [])}
+     |> assign_new(:query, fn -> "" end)
+     |> assign_new(:collected_results, fn -> [] end)
+     |> assign_new(:wishlisted_results, fn -> [] end)}
   end
 
   @impl true