diff --git a/js/page/watch.js b/js/page/watch.js
index ea7d2c91a..274074c4c 100644
--- a/js/page/watch.js
+++ b/js/page/watch.js
@@ -8,10 +8,20 @@ var WatchPage = React.createClass({
   propTypes: {
     name: React.PropTypes.string,
   },
+  updateVideo: function(video, firstRun=true) {
+    if (!video.readyState) {
+      if (!firstRun) { // On the first run, give the browser's initial load a chance to work
+         video.load();
+      }
+      setTimeout(() => {
+        this.updateVideo(video, false);
+      }, 3000);
+    }
+  },
   render: function() {
     return (
       <main>
-        <video style={videoStyle} src={"/view?name=" + this.props.name} controls></video>
+        <video style={videoStyle} src={"/view?name=" + this.props.name} ref={this.updateVideo} controls></video>
       </main>
     );
   }