diff --git a/src/invidious/views/watch.ecr b/src/invidious/views/watch.ecr
index b4247fd41..8b225ec6a 100644
--- a/src/invidious/views/watch.ecr
+++ b/src/invidious/views/watch.ecr
@@ -275,6 +275,28 @@ function get_playlist() {
 get_playlist();
 <% end %>
 
+<% if params[:autoplay] %>
+var bpb = player.getChild('bigPlayButton');
+
+if (bpb) {
+  bpb.hide();
+  
+  player.ready(function() {
+    var promise = player.play();
+
+    if (promise === undefined) {
+      bpb.show();
+    } else {
+      promise.then(function() {
+        bpb.show();
+      }, function() {
+        bpb.show();
+      });
+    }
+  });
+}
+<% end %>
+
 function get_reddit_comments() {
   comments = document.getElementById("comments");
   var fallback = comments.innerHTML;