diff --git a/lib/music_library/online_store_templates.ex b/lib/music_library/online_store_templates.ex
index 9feab061..8df38b96 100644
--- a/lib/music_library/online_store_templates.ex
+++ b/lib/music_library/online_store_templates.ex
@@ -71,8 +71,8 @@ defmodule MusicLibrary.OnlineStoreTemplates do
     format_string = Atom.to_string(record.format)
 
     template.url_template
-    |> String.replace("{artist}", URI.encode(artists_string))
-    |> String.replace("{title}", URI.encode(record.title))
-    |> String.replace("{format}", URI.encode(format_string))
+    |> String.replace("{artist}", URI.encode_www_form(artists_string))
+    |> String.replace("{title}", URI.encode_www_form(record.title))
+    |> String.replace("{format}", URI.encode_www_form(format_string))
   end
 end