1 files changed, 6 insertions, 0 deletions
diff --git a/web/react/components/posts_view.jsx b/web/react/components/posts_view.jsx
index f5a492b85..2b81d1d79 100644
--- a/web/react/components/posts_view.jsx
+++ b/web/react/components/posts_view.jsx
@@ -4,6 +4,7 @@
 const UserStore = require('../stores/user_store.jsx');
 const Utils = require('../utils/utils.jsx');
 const Post = require('./post.jsx');
+const Constants = require('../utils/constants.jsx');
 
 export default class PostsView extends React.Component {
     constructor(props) {
@@ -69,6 +70,11 @@ export default class PostsView extends React.Component {
             const parentPost = posts[post.parent_id];
             const prevPost = posts[order[i + 1]];
 
+            // 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;
+            }
+
             let sameUser = false;
             let sameRoot = false;
             let hideProfilePic = false;