diff --git a/src/renderer/components/watch-video-comments/watch-video-comments.js b/src/renderer/components/watch-video-comments/watch-video-comments.js
index 819d964f..eda2f008 100644
--- a/src/renderer/components/watch-video-comments/watch-video-comments.js
+++ b/src/renderer/components/watch-video-comments/watch-video-comments.js
@@ -50,6 +50,16 @@ export default Vue.extend({
       }
     },
 
+    getMoreComments: function () {
+      if (this.commentData.length === 0 || this.nextPageToken === null || typeof this.nextPageToken === 'undefined') {
+        this.showToast({
+          message: this.$t('Comments.There are no more comments for this video')
+        })
+      } else {
+        this.getCommentData()
+      }
+    },
+
     getCommentReplies: function (index) {
       switch (this.commentData[index].dataType) {
         case 'local':
@@ -173,7 +183,7 @@ export default Vue.extend({
 
     getCommentRepliesInvidious: function (index) {
       this.showToast({
-        message: this.$t('Getting comment replies, please wait')
+        message: this.$t('Comments.Getting comment replies, please wait')
       })
       const payload = {
         resource: 'comments',
diff --git a/src/renderer/components/watch-video-comments/watch-video-comments.vue b/src/renderer/components/watch-video-comments/watch-video-comments.vue
index 9c155c15..ece71b3b 100644
--- a/src/renderer/components/watch-video-comments/watch-video-comments.vue
+++ b/src/renderer/components/watch-video-comments/watch-video-comments.vue
@@ -114,7 +114,7 @@
     <h4
       v-if="commentData.length > 0 && !isLoading && showComments"
       class="getMoreComments"
-      @click="getCommentData"
+      @click="getMoreComments"
     >
       {{ $t("Comments.Load More Comments") }}
     </h4>
diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml
index b520ef17..afc591ef 100644
--- a/static/locales/en-US.yaml
+++ b/static/locales/en-US.yaml
@@ -473,6 +473,7 @@ Comments:
   Comments: Comments
   Click to View Comments: Click to View Comments
   Getting comment replies, please wait: Getting comment replies, please wait
+  There are no more comments for this video: There are no more comments for this video
   Show Comments: Show Comments
   Hide Comments: Hide Comments
   # Context: View 10 Replies, View 1 Reply