diff --git a/src/components/HLS.js b/src/components/HLS.js
index 0303170..6a6f0f5 100644
--- a/src/components/HLS.js
+++ b/src/components/HLS.js
@@ -14,7 +14,6 @@ export default class HLS extends Component {
     onLoadEnd: PropTypes.func,
     onPlaySeek: PropTypes.func,
     segmentProgress: PropTypes.func,
-    shouldRestart: PropTypes.bool,
     onRestart: PropTypes.func
   };
 
@@ -41,6 +40,26 @@ export default class HLS extends Component {
       enableWorker: false,
       disablePtsDtsCorrectionInMp4Remux: true
     });
+    this.player.on(Hls.Events.ERROR, (event, data) => {
+      if (data.fatal) {
+        switch (data.type) {
+          case Hls.ErrorTypes.NETWORK_ERROR:
+          // try to recover network error
+            console.log("fatal network error encountered, try to recover");
+            this.player.startLoad();
+            break;
+          case Hls.ErrorTypes.MEDIA_ERROR:
+            console.log("fatal media error encountered, try to recover");
+            this.player.recoverMediaError();
+            break;
+          default:
+          // cannot recover
+            this.player.destroy();
+            this.player = null;
+            break;
+        }
+      }
+    });
     this.loadSource();
   }
 
@@ -78,6 +97,7 @@ export default class HLS extends Component {
     // destroy hls video source
     if (this.player) {
       this.player.destroy();
+      this.player = null;
     }
   }
 
diff --git a/src/components/RouteVideoSync.js b/src/components/RouteVideoSync.js
index 0b6167e..cc0db2f 100644
--- a/src/components/RouteVideoSync.js
+++ b/src/components/RouteVideoSync.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { StyleSheet, css } from 'aphrodite/no-important';
-import { derived as RouteApi, video as VideoApi } from '@commaai/comma-api';
+import { video as VideoApi } from '@commaai/comma-api';
 
 import HLS from './HLS';
 import RouteSeeker from './RouteSeeker/RouteSeeker';
@@ -50,7 +50,6 @@ export default class RouteVideoSync extends Component {
       shouldShowJpeg: true,
       isLoading: true,
       videoElement: null,
-      shouldRestartHls: false
     };
 
     this.onLoadStart = this.onLoadStart.bind(this);
@@ -59,27 +58,12 @@ export default class RouteVideoSync extends Component {
     this.onVideoElementAvailable = this.onVideoElementAvailable.bind(this);
     this.onUserSeek = this.onUserSeek.bind(this);
     this.onPlaySeek = this.onPlaySeek.bind(this);
-    this.onHlsRestart = this.onHlsRestart.bind(this);
     this.ratioTime = this.ratioTime.bind(this);
   }
 
   componentDidUpdate(nextProps) {
-    const {
-      userSeekIndex,
-      message,
-      canFrameOffset,
-      userSeekTime
-    } = this.props;
+    const { userSeekTime } = this.props;
     const { videoElement } = this.state;
-    if (
-      userSeekIndex !== nextProps.userSeekIndex
-      || canFrameOffset !== nextProps.canFrameOffset
-      || (message
-        && nextProps.message
-        && message.entries.length !== nextProps.message.entries.length)
-    ) {
-      this.setState({ shouldRestartHls: true });
-    }
     if (
       nextProps.userSeekTime
       && userSeekTime !== nextProps.userSeekTime
@@ -103,22 +87,15 @@ export default class RouteVideoSync extends Component {
     const funcSeekToRatio = () => onUserSeek(seekTime);
 
     if (Number.isNaN(videoElement.duration)) {
-      this.setState({ shouldRestartHls: true }, funcSeekToRatio);
       return;
     }
     videoElement.currentTime = seekTime;
 
-    if (ratio === 0) {
-      this.setState({ shouldRestartHls: true }, funcSeekToRatio);
-    } else {
+    if (ratio !== 0) {
       funcSeekToRatio();
     }
   }
 
-  onHlsRestart() {
-    this.setState({ shouldRestartHls: false });
-  }
-
   onPlaySeek(offset) {
     const { onPlaySeek } = this.props;
     this.seekTime = offset;
@@ -204,7 +181,6 @@ export default class RouteVideoSync extends Component {
   render() {
     const {
       isLoading,
-      shouldRestartHls,
       shouldShowJpeg,
       videoElement
     } = this.state;
@@ -244,8 +220,6 @@ export default class RouteVideoSync extends Component {
           onUserSeek={this.onUserSeek}
           onPlaySeek={this.onPlaySeek}
           segmentProgress={this.segmentProgress}
-          shouldRestart={shouldRestartHls}
-          onRestart={this.onHlsRestart}
         />
         <RouteSeeker
           className={css(Styles.seekBar)}
@@ -268,11 +242,8 @@ export default class RouteVideoSync extends Component {
 }
 
 RouteVideoSync.propTypes = {
-  userSeekIndex: PropTypes.number.isRequired,
   segment: PropTypes.array.isRequired,
-  message: PropTypes.object,
   thumbnails: PropTypes.array,
-  canFrameOffset: PropTypes.number.isRequired,
   url: PropTypes.string.isRequired,
   playing: PropTypes.bool.isRequired,
   onPlaySeek: PropTypes.func.isRequired,