1 files changed, 5 insertions, 0 deletions
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index b9741bac4..444736db5 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -556,6 +556,11 @@ export default class PostList extends React.Component {
             var post = posts[order[i]];
             var parentPost = posts[post.parent_id];
 
+            // If the post is a comment whose parent has been deleted, don't add it to the list.
+            if (parentPost && parentPost.state === Constants.POST_DELETED) {
+                continue;
+            }
+
             var sameUser = false;
             var sameRoot = false;
             var hideProfilePic = false;