diff --git a/src/components/TwitchChat.vue b/src/components/TwitchChat.vue
index 45d0782..e90dd8c 100644
--- a/src/components/TwitchChat.vue
+++ b/src/components/TwitchChat.vue
@@ -22,7 +22,7 @@ export default {
     const protocol = import.meta.env.VITE_HTTPS === 'true' ? 'https://' : 'http://'
     
     const badgesFetch = await fetch(`${protocol}${import.meta.env.VITE_BACKEND_DOMAIN}/api/badges?channelName=${props.channelName}`)
-    let badges: Badge[] =  await badgesFetch.json()
+    let badges: Badge[] =  (await badgesFetch.json()).data
 
     return {
       ws: new WebSocket(`ws://${import.meta.env.VITE_BACKEND_DOMAIN}`),
@@ -75,6 +75,10 @@ export default {
   },
   components: {
     BadgeVue
+  },
+  unmounted() {
+    this.messages = []
+    this.badges = []
   }
 }
 </script>
diff --git a/src/components/VideoPlayer.vue b/src/components/VideoPlayer.vue
index aca4e63..6dc69a5 100644
--- a/src/components/VideoPlayer.vue
+++ b/src/components/VideoPlayer.vue
@@ -34,6 +34,9 @@ export default {
     this.player = videojs('video-player', this.options, () => {
       createQualitySelector(this.player)
     })
+  },
+  unmounted() {
+    this.player.dispose()
   }
 }
 </script>