diff --git a/pkg/interface/src/views/components/CommentItem.tsx b/pkg/interface/src/views/components/CommentItem.tsx
index 72ab4bfc6b..38e59b8332 100644
--- a/pkg/interface/src/views/components/CommentItem.tsx
+++ b/pkg/interface/src/views/components/CommentItem.tsx
@@ -43,7 +43,7 @@ export function CommentItem(props: CommentItemProps) {
   const updateUrl = `${props.baseUrl}/${commentIndex}`
 
   return (
-    <Box mb={4} opacity={post?.pending ? '60%' : '100%'}>
+    <Box mb={4} opacity={props.pending ? '60%' : '100%'}>
       <Row bg="white" my={3}>
         <Author
           showImage
diff --git a/pkg/interface/src/views/components/Comments.tsx b/pkg/interface/src/views/components/Comments.tsx
index 03b32b44f8..2fb629f417 100644
--- a/pkg/interface/src/views/components/Comments.tsx
+++ b/pkg/interface/src/views/components/Comments.tsx
@@ -100,7 +100,6 @@ export function Comments(props: CommentsProps) {
         />
       ) : null )}
       {Array.from(comments.children).reverse()
-        .filter(([idx, _]) => idx.toString() !== props.editCommentId)
         .map(([idx, comment]) => {
           return (
             <CommentItem
@@ -114,6 +113,7 @@ export function Comments(props: CommentsProps) {
               hideAvatars={props.hideAvatars}
               remoteContentPolicy={props.remoteContentPolicy}
               baseUrl={props.baseUrl}
+              pending={idx.toString() === props.editCommentId}
             />
           );
       })}