diff --git a/package-lock.json b/package-lock.json
index 42f8e5a43..1472ed406 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3052,6 +3052,14 @@
       "resolved": "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.2.tgz",
       "integrity": "sha512-ecpKSBUWXsxRJVi/dbOds4tkKwEcBQ1JSDZFzE2jTFpF8xIh3OgTX8POIor6bOltjibr3cdEyvnDjecMwUmxhQ=="
     },
+    "@freetube/youtube-chat": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@freetube/youtube-chat/-/youtube-chat-1.1.1.tgz",
+      "integrity": "sha512-Wqyv3Cl7tFfQaMRgYmeTNwtt5VNN/6NLbXWlWtiZMGvhSmsOCeeQmSYovewU9ckC7jFzHIhGY54qdRfEq1YOKQ==",
+      "requires": {
+        "axios": "^0.21.1"
+      }
+    },
     "@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@@ -5150,11 +5158,18 @@
       "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA=="
     },
     "axios": {
-      "version": "0.19.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
-      "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
+      "version": "0.21.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
+      "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
       "requires": {
-        "follow-redirects": "1.5.10"
+        "follow-redirects": "^1.10.0"
+      },
+      "dependencies": {
+        "follow-redirects": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
+          "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg=="
+        }
       }
     },
     "babel-eslint": {
@@ -6830,6 +6845,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
       "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+      "dev": true,
       "requires": {
         "ms": "2.0.0"
       }
@@ -9287,6 +9303,7 @@
       "version": "1.5.10",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
       "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+      "dev": true,
       "requires": {
         "debug": "=3.1.0"
       }
@@ -12869,7 +12886,8 @@
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
     },
     "multicast-dns": {
       "version": "6.2.3",
@@ -18067,13 +18085,6 @@
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "dev": true
     },
-    "youtube-chat": {
-      "version": "git+https://github.com/IcedCoffeee/youtube-chat.git#3e20049c605e58a9de14c1df6d50cce7ca01d214",
-      "from": "git+https://github.com/IcedCoffeee/youtube-chat.git",
-      "requires": {
-        "axios": "^0.19.2"
-      }
-    },
     "youtube-suggest": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/youtube-suggest/-/youtube-suggest-1.1.2.tgz",
diff --git a/package.json b/package.json
index 8e3d610d9..00f66d8b0 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
     "@fortawesome/free-brands-svg-icons": "^5.15.3",
     "@fortawesome/free-solid-svg-icons": "^5.15.3",
     "@fortawesome/vue-fontawesome": "^2.0.2",
+    "@freetube/youtube-chat": "^1.1.1",
     "@silvermine/videojs-quality-selector": "^1.2.5",
     "autolinker": "^3.14.3",
     "bulma-pro": "^0.2.0",
@@ -45,7 +46,6 @@
     "vue-router": "^3.5.1",
     "vuex": "^3.6.2",
     "xml2json": "^0.12.0",
-    "youtube-chat": "git+https://github.com/IcedCoffeee/youtube-chat.git",
     "youtube-suggest": "^1.1.2",
     "yt-channel-info": "^2.2.0",
     "yt-comment-scraper": "^5.0.1",
diff --git a/src/renderer/components/watch-video-live-chat/watch-video-live-chat.js b/src/renderer/components/watch-video-live-chat/watch-video-live-chat.js
index c2ddccb92..1b74d4678 100644
--- a/src/renderer/components/watch-video-live-chat/watch-video-live-chat.js
+++ b/src/renderer/components/watch-video-live-chat/watch-video-live-chat.js
@@ -7,7 +7,7 @@ import FtListVideo from '../ft-list-video/ft-list-video.vue'
 
 import $ from 'jquery'
 import autolinker from 'autolinker'
-import { LiveChat } from 'youtube-chat'
+import { LiveChat } from '@freetube/youtube-chat'
 
 export default Vue.extend({
   name: 'WatchVideoLiveChat',