diff --git a/src/invidious/views/embed.ecr b/src/invidious/views/embed.ecr
index e9c094029..81926c4aa 100644
--- a/src/invidious/views/embed.ecr
+++ b/src/invidious/views/embed.ecr
@@ -29,8 +29,12 @@ video, #my_video, .video-js, .vjs-default-skin
 }
 </style>
 
-<video playsinline poster="<%= thumbnail %>" title="<%= HTML.escape(video.title) %>" id="player" class="video-js vjs-default-skin">
+<video playsinline poster="<%= thumbnail %>" title="<%= HTML.escape(video.title) %>" id="player" 
+    <% if autoplay == 1 %>autoplay<% end %>
+    <% if controls == 1 %>controls<% end %>
+    <% if video_loop == 1 %>loop<% end %>
     <% if listen %>
+    class="video-js vjs-default-skin">
         <% audio_streams.each_with_index do |fmt, i| %>
             <source src="<%= fmt["url"] %>" type='<%= fmt["type"] %>' label="<%= fmt["bitrate"] %>k" selected="<%= i == 0 ? true : false %>">
         <% end %>
@@ -44,9 +48,6 @@ video, #my_video, .video-js, .vjs-default-skin
 <script>
 var options = {
     preload: "auto",
-    <% if autoplay == 1 %>autoplay: true, <% end %>
-    <% if controls == 1 %>controls: true, <% end %>
-    <% if video_loop == 1 %>loop: true, <% end %>
     playbackRates: [0.5, 1, 1.5, 2],
     controlBar: {
       children: [
diff --git a/src/invidious/views/watch.ecr b/src/invidious/views/watch.ecr
index afbb56584..3fb7ecdac 100644
--- a/src/invidious/views/watch.ecr
+++ b/src/invidious/views/watch.ecr
@@ -10,7 +10,13 @@
 <% end %>
 
 <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="{}" controls>
+    <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 %>
+        controls>
         <% if listen %>
             <% audio_streams.each_with_index do |fmt, i| %>
                 <source src="<%= fmt["url"] %>" type='<%= fmt["type"] %>' label="<%= fmt["bitrate"] %>k" selected="<%= i == 0 ? true : false %>">
@@ -30,10 +36,6 @@
 <script>
 var options = {
     preload: "auto",
-    <% if preferences %>
-    <% if preferences.autoplay %>autoplay: true, <% end %>
-    <% if preferences.video_loop %>loop: true, <% end %>
-    <% end %>
     playbackRates: [0.5, 1, 1.5, 2],
     controlBar: {
       children: [