diff --git a/src/components/comment/Comment/index.tsx b/src/components/comment/Comment/index.tsx
index edd5005a..cdd2efe9 100644
--- a/src/components/comment/Comment/index.tsx
+++ b/src/components/comment/Comment/index.tsx
@@ -11,21 +11,21 @@ import { NEW_COMMENT_CLASSNAME } from '~/constants/comment';
 type IProps = HTMLAttributes<HTMLDivElement> & {
   is_empty?: boolean;
   is_loading?: boolean;
-  comment_group: ICommentGroup;
-  is_same?: boolean;
-  can_edit?: boolean;
+  group: ICommentGroup;
+  isSame?: boolean;
+  canEdit?: boolean;
   onDelete: (id: IComment['id'], isLocked: boolean) => void;
   modalShowPhotoswipe: typeof MODAL_ACTIONS.modalShowPhotoswipe;
 };
 
 const Comment: FC<IProps> = memo(
   ({
-    comment_group,
+    group,
     is_empty,
-    is_same,
+    isSame,
     is_loading,
     className,
-    can_edit,
+    canEdit,
     onDelete,
     modalShowPhotoswipe,
     ...props
@@ -33,17 +33,16 @@ const Comment: FC<IProps> = memo(
     return (
       <CommentWrapper
         className={classNames(className, {
-          [NEW_COMMENT_CLASSNAME]: comment_group.hasNew,
+          [NEW_COMMENT_CLASSNAME]: group.hasNew,
         })}
         isEmpty={is_empty}
         isLoading={is_loading}
-        user={comment_group.user}
-        isSame={is_same}
-        isNew={comment_group.hasNew}
+        user={group.user}
+        isNew={group.hasNew && !isSame}
         {...props}
       >
         <div className={styles.wrap}>
-          {comment_group.comments.map(comment => {
+          {group.comments.map(comment => {
             if (comment.deleted_at) {
               return <CommendDeleted id={comment.id} onDelete={onDelete} key={comment.id} />;
             }
@@ -52,7 +51,7 @@ const Comment: FC<IProps> = memo(
               <CommentContent
                 comment={comment}
                 key={comment.id}
-                can_edit={!!can_edit}
+                can_edit={!!canEdit}
                 onDelete={onDelete}
                 modalShowPhotoswipe={modalShowPhotoswipe}
               />
diff --git a/src/components/containers/CommentWrapper/index.tsx b/src/components/containers/CommentWrapper/index.tsx
index 59e5acb1..6b293b51 100644
--- a/src/components/containers/CommentWrapper/index.tsx
+++ b/src/components/containers/CommentWrapper/index.tsx
@@ -11,7 +11,6 @@ type IProps = DivProps & {
   user: IUser;
   isEmpty?: boolean;
   isLoading?: boolean;
-  isSame?: boolean;
   isForm?: boolean;
   isNew?: boolean;
 };
@@ -21,7 +20,6 @@ const CommentWrapper: FC<IProps> = ({
   className,
   isEmpty,
   isLoading,
-  isSame,
   isForm,
   children,
   isNew,
@@ -31,7 +29,6 @@ const CommentWrapper: FC<IProps> = ({
     className={classNames(styles.wrap, className, {
       [styles.is_empty]: isEmpty,
       [styles.is_loading]: isLoading,
-      [styles.is_same]: isSame,
       [styles.is_new]: isNew,
     })}
     {...props}
diff --git a/src/components/node/NodeComments/index.tsx b/src/components/node/NodeComments/index.tsx
index cf34966b..446d32ab 100644
--- a/src/components/node/NodeComments/index.tsx
+++ b/src/components/node/NodeComments/index.tsx
@@ -58,10 +58,11 @@ const NodeComments: FC<IProps> = memo(
         {groupped.map(group => (
           <Comment
             key={group.ids.join()}
-            comment_group={group}
-            can_edit={canEditComment(group, user)}
+            group={group}
+            canEdit={canEditComment(group, user)}
             onDelete={onDelete}
             modalShowPhotoswipe={onShowPhotoswipe}
+            isSame={group.user.id === user.id}
           />
         ))}