diff --git a/web/package-lock.json b/web/package-lock.json
index 4ebdb74e5..679a1e945 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -30,6 +30,7 @@
         "@testing-library/preact": "^2.0.1",
         "@testing-library/preact-hooks": "^1.1.0",
         "@testing-library/user-event": "^13.5.0",
+        "@types/video.js": "^7.3.42",
         "@typescript-eslint/eslint-plugin": "^5.18.0",
         "@typescript-eslint/parser": "^5.18.0",
         "autoprefixer": "^10.4.2",
@@ -3234,6 +3235,12 @@
         "@types/jest": "*"
       }
     },
+    "node_modules/@types/video.js": {
+      "version": "7.3.42",
+      "resolved": "https://registry.npmjs.org/@types/video.js/-/video.js-7.3.42.tgz",
+      "integrity": "sha512-AD6AQNMgLTqrgoayC6SshKh8EDkDd9x5pmEuiY9YsniHlhn5jPXdkVqrzKLwviapaRhQF15TQYxo1JWpqXCUBg==",
+      "dev": true
+    },
     "node_modules/@types/yargs": {
       "version": "16.0.4",
       "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
@@ -14504,6 +14511,12 @@
         "@types/jest": "*"
       }
     },
+    "@types/video.js": {
+      "version": "7.3.42",
+      "resolved": "https://registry.npmjs.org/@types/video.js/-/video.js-7.3.42.tgz",
+      "integrity": "sha512-AD6AQNMgLTqrgoayC6SshKh8EDkDd9x5pmEuiY9YsniHlhn5jPXdkVqrzKLwviapaRhQF15TQYxo1JWpqXCUBg==",
+      "dev": true
+    },
     "@types/yargs": {
       "version": "16.0.4",
       "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
diff --git a/web/package.json b/web/package.json
index e6d727d60..10416b888 100644
--- a/web/package.json
+++ b/web/package.json
@@ -32,6 +32,7 @@
     "@testing-library/preact": "^2.0.1",
     "@testing-library/preact-hooks": "^1.1.0",
     "@testing-library/user-event": "^13.5.0",
+    "@types/video.js": "^7.3.42",
     "@typescript-eslint/eslint-plugin": "^5.18.0",
     "@typescript-eslint/parser": "^5.18.0",
     "autoprefixer": "^10.4.2",
diff --git a/web/src/components/HistoryViewer/HistoryVideo.tsx b/web/src/components/HistoryViewer/HistoryVideo.tsx
index b7cc86559..6a513f29c 100644
--- a/web/src/components/HistoryViewer/HistoryVideo.tsx
+++ b/web/src/components/HistoryViewer/HistoryVideo.tsx
@@ -1,5 +1,5 @@
 import { h } from 'preact';
-import { useCallback, useEffect, useRef } from 'preact/hooks';
+import { useCallback, useEffect, useRef, useState } from 'preact/hooks';
 import { useApiHost } from '../../api';
 import { isNullOrUndefined } from '../../utils/objectUtils';
 
@@ -7,7 +7,7 @@ import 'videojs-seek-buttons';
 import 'video.js/dist/video-js.css';
 import 'videojs-seek-buttons/dist/videojs-seek-buttons.css';
 
-import videojs from 'video.js';
+import videojs, { VideoJsPlayer } from 'video.js';
 
 interface OnTimeUpdateEvent {
   timestamp: number;
@@ -34,18 +34,28 @@ export const HistoryVideo = ({
   const apiHost = useApiHost();
   const videoRef = useRef<HTMLVideoElement>(null);
 
+  const [video, setVideo] = useState<VideoJsPlayer>();
+
   useEffect(() => {
-    let video: any;
-    if (videoRef.current && id) {
-      video = videojs(videoRef.current, {});
+    let video: VideoJsPlayer
+    if (videoRef.current) {
+      video = videojs(videoRef.current, {})
+      setVideo(video)
     }
+    () => video?.dispose()
   }, [videoRef]);
 
   useEffect(() => {
-    if (!id) {
-      return;
+    if (!video) {
+      return
     }
-    const video = videojs(videoRef.current);
+
+
+    if (!id) {
+      video.pause()
+      return
+    }
+
     video.src({
       src: `${apiHost}/vod/event/${id}/index.m3u8`,
       type: 'application/vnd.apple.mpegurl',
@@ -54,20 +64,7 @@ export const HistoryVideo = ({
     if (videoIsPlaying) {
       video.play();
     }
-  }, [id]);
-
-  useEffect(() => {
-    if (!videoRef) {
-      return;
-    }
-
-    const video = videojs(videoRef.current);
-    if (video.paused() && videoIsPlaying) {
-      video.play();
-    } else if (!video.paused() && !videoIsPlaying) {
-      video.pause();
-    }
-  }, [videoIsPlaying, videoRef]);
+  }, [video, id]);
 
   useEffect(() => {
     const video = videoRef.current;
@@ -90,11 +87,28 @@ export const HistoryVideo = ({
     [videoIsPlaying, onTimeUpdate]
   );
 
+  useEffect(() => {
+    if (video && video.readyState() >= 1) {
+      if (videoIsPlaying) {
+        video.play()
+      } else {
+        video.pause()
+      }
+    }
+  }, [video, videoIsPlaying])
+
+  const onLoad = useCallback(() => {
+    if (video && video.readyState() >= 1 && videoIsPlaying) {
+      video.play()
+    }
+  }, [video, videoIsPlaying])
+  
   return (
     <div data-vjs-player>
       <video
         ref={videoRef}
         onTimeUpdate={onTimeUpdateHandler}
+        onLoadedMetadata={onLoad}
         onPause={onPause}
         onPlay={onPlay}
         className="video-js vjs-fluid"