diff --git a/app/src/main/java/com/github/libretube/ui/extensions/FilterNonEmptyComments.kt b/app/src/main/java/com/github/libretube/ui/extensions/FilterNonEmptyComments.kt
new file mode 100644
index 000000000..5f4aa0b0e
--- /dev/null
+++ b/app/src/main/java/com/github/libretube/ui/extensions/FilterNonEmptyComments.kt
@@ -0,0 +1,7 @@
+package com.github.libretube.ui.extensions
+
+import com.github.libretube.api.obj.Comment
+
+fun List<Comment>.filterNonEmptyComments(): List<Comment> {
+    return filter { !it.commentText.isNullOrEmpty() }
+}
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/CommentsRepliesFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/CommentsRepliesFragment.kt
index 7e29f24ba..343163f27 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/CommentsRepliesFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/CommentsRepliesFragment.kt
@@ -17,6 +17,7 @@ import com.github.libretube.constants.IntentData
 import com.github.libretube.databinding.FragmentCommentsBinding
 import com.github.libretube.extensions.TAG
 import com.github.libretube.ui.adapters.CommentsAdapter
+import com.github.libretube.ui.extensions.filterNonEmptyComments
 import com.github.libretube.ui.models.CommentsViewModel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -97,6 +98,7 @@ class CommentsRepliesFragment : Fragment() {
                 Log.e(TAG(), "IOException, you might not have internet connection")
                 return@launch
             }
+            repliesPage.comments = repliesPage.comments.filterNonEmptyComments()
             withContext(Dispatchers.Main) {
                 onFinished.invoke(repliesPage)
             }
diff --git a/app/src/main/java/com/github/libretube/ui/models/CommentsViewModel.kt b/app/src/main/java/com/github/libretube/ui/models/CommentsViewModel.kt
index 4d142fc79..33d6c2fb1 100644
--- a/app/src/main/java/com/github/libretube/ui/models/CommentsViewModel.kt
+++ b/app/src/main/java/com/github/libretube/ui/models/CommentsViewModel.kt
@@ -6,6 +6,7 @@ import androidx.lifecycle.ViewModel
 import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.api.obj.CommentsPage
 import com.github.libretube.extensions.TAG
+import com.github.libretube.ui.extensions.filterNonEmptyComments
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -33,6 +34,7 @@ class CommentsViewModel : ViewModel() {
                 return@launch
             }
             nextPage = response.nextpage
+            response.comments = response.comments.filterNonEmptyComments()
             commentsPage.postValue(response)
             isLoading = false
         }
@@ -49,7 +51,7 @@ class CommentsViewModel : ViewModel() {
                 return@launch
             }
             val updatedPage = commentsPage.value?.apply {
-                comments += response.comments
+                comments += response.comments.filterNonEmptyComments()
             }
             nextPage = response.nextpage
             commentsPage.postValue(updatedPage)