diff --git a/lib/music_library_web/live/record_set_live/record_picker.ex b/lib/music_library_web/live/record_set_live/record_picker.ex
index a9c4ebd3..96c8bbeb 100644
--- a/lib/music_library_web/live/record_set_live/record_picker.ex
+++ b/lib/music_library_web/live/record_set_live/record_picker.ex
@@ -140,9 +140,9 @@ defmodule MusicLibraryWeb.RecordSetLive.RecordPicker 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)
      |> assign(:existing_record_ids, existing_record_ids)}
   end