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 259732c8b..cb6ee4299 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
@@ -118,6 +118,9 @@ export default Vue.extend({
       this.liveChat.on('end', (reason) => {
         console.log('Live chat has ended')
         console.log(reason)
+        this.hasError = true
+        this.showEnableChat = false
+        this.errorMessage = 'Chat is disabled or the Live Stream has ended.'
       })
 
       this.liveChat.on('error', (err) => {
diff --git a/src/renderer/components/watch-video-live-chat/watch-video-live-chat.vue b/src/renderer/components/watch-video-live-chat/watch-video-live-chat.vue
index 4a21390d9..68aa14baa 100644
--- a/src/renderer/components/watch-video-live-chat/watch-video-live-chat.vue
+++ b/src/renderer/components/watch-video-live-chat/watch-video-live-chat.vue
@@ -17,6 +17,7 @@
         class="errorIcon"
       />
       <ft-button
+        v-if="showEnableChat"
         label="Enable Live Chat"
         class="enableLiveChat"
         @click="enableLiveChat"