diff --git a/locales/en-US.json b/locales/en-US.json
index 18eb01126..fa28e7f8b 100644
--- a/locales/en-US.json
+++ b/locales/en-US.json
@@ -123,6 +123,7 @@
     "preferences_max_results_label": "Number of videos shown in feed: ",
     "preferences_sort_label": "Sort videos by: ",
     "preferences_default_playlist": "Default playlist: ",
+    "preferences_default_playlist_none": "No default playlist set",
     "published": "published",
     "published - reverse": "published - reverse",
     "alphabetically": "alphabetically",
diff --git a/locales/es.json b/locales/es.json
index 1342c1c68..686e13f93 100644
--- a/locales/es.json
+++ b/locales/es.json
@@ -79,6 +79,7 @@
     "preferences_max_results_label": "Número de videos mostrados en la fuente: ",
     "preferences_sort_label": "Ordenar los videos por: ",
     "preferences_default_playlist": "Lista de reproducción por defecto: ",
+    "preferences_default_playlist_none": "Ninguna lista de reproducción por defecto establecida",
     "published": "fecha de publicación",
     "published - reverse": "fecha de publicación: orden inverso",
     "alphabetically": "alfabéticamente",
diff --git a/src/invidious/views/user/preferences.ecr b/src/invidious/views/user/preferences.ecr
index 2a132e539..7d18c394d 100644
--- a/src/invidious/views/user/preferences.ecr
+++ b/src/invidious/views/user/preferences.ecr
@@ -208,11 +208,12 @@
                 <input name="automatic_instance_redirect" id="automatic_instance_redirect" type="checkbox" <% if preferences.automatic_instance_redirect %>checked<% end %>>
             </div>
 
-            <% if user = env.get?("user").as(User) %>
+            <% if user = env.get?("user").try &.as(User) %>
                 <% playlists = Invidious::Database::Playlists.select_user_created_playlists(user.email) %>
                 <div class="pure-control-group">
                     <label for="default_playlist"><%= translate(locale, "preferences_default_playlist") %></label>
                     <select name="default_playlist" id="default_playlist">
+                        <option value=""><%= translate(locale, "preferences_default_playlist_none") %></option>
                         <% playlists.each do |plid, playlist_title| %>
                             <option value="<%= plid %>" <%= "selected" if user.preferences.default_playlist == plid %>><%= HTML.escape(playlist_title) %></option>
                         <% end %>