diff --git a/src/invidious.cr b/src/invidious.cr
index de86fe17..4b8f67ba 100644
--- a/src/invidious.cr
+++ b/src/invidious.cr
@@ -274,6 +274,20 @@ get "/watch" do |env|
     next env.redirect "/"
   end
 
+  autoplay = env.params.query["autoplay"]?.try &.to_i
+  video_loop = env.params.query["video_loop"]?.try &.to_i
+
+  if preferences
+    autoplay ||= preferences.autoplay.to_unsafe
+    video_loop ||= preferences.video_loop.to_unsafe
+  end
+
+  autoplay ||= 0
+  video_loop ||= 0
+
+  autoplay = autoplay == 1
+  video_loop = video_loop == 1
+
   if env.params.query["start"]?
     video_start = decode_time(env.params.query["start"])
   end
diff --git a/src/invidious/views/watch.ecr b/src/invidious/views/watch.ecr
index 7eb6c003..82087c53 100644
--- a/src/invidious/views/watch.ecr
+++ b/src/invidious/views/watch.ecr
@@ -12,10 +12,8 @@
 <div class="h-box">
     <video style="width:100%" playsinline poster="<%= thumbnail %>" title="<%= HTML.escape(video.title) %>" 
         id="player" class="video-js vjs-16-9" data-setup="{}" 
-        <% if preferences %>
-        <% if preferences.autoplay %>autoplay<% end %>
-        <% if preferences.video_loop %>loop<% end %>
-        <% end %>
+        <% if autoplay %>autoplay<% end %>
+        <% if video_loop %>loop<% end %>
         controls>
         <% if listen %>
             <% audio_streams.each_with_index do |fmt, i| %>