diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/comments/CommentNode.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/comments/CommentNode.kt
index 40ac652f..f25df8e7 100644
--- a/common/src/main/kotlin/dev/msfjarvis/claw/common/comments/CommentNode.kt
+++ b/common/src/main/kotlin/dev/msfjarvis/claw/common/comments/CommentNode.kt
@@ -77,6 +77,10 @@ fun LazyListScope.node(
   htmlConverter: HTMLConverter,
   toggleExpanded: (CommentNode) -> Unit,
 ) {
+  // Skip the node if neither the node nor its parent is expanded
+  if (!node.isExpanded && node.parent?.isExpanded == false) {
+    return
+  }
   item {
     CommentEntry(
       commentNode = node,