diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-comment-options.tsx b/services/web/frontend/js/features/review-panel-new/components/review-panel-comment-options.tsx
index 790ba0f906..b04b1272c6 100644
--- a/services/web/frontend/js/features/review-panel-new/components/review-panel-comment-options.tsx
+++ b/services/web/frontend/js/features/review-panel-new/components/review-panel-comment-options.tsx
@@ -28,7 +28,8 @@ const ReviewPanelCommentOptions: FC<{
   onEdit: () => void
   onDelete: () => void
   id: string
-}> = ({ onEdit, onDelete, id }) => {
+  belongsToCurrentUser: boolean
+}> = ({ onEdit, onDelete, id, belongsToCurrentUser }) => {
   const { t } = useTranslation()
 
   return (
@@ -43,7 +44,9 @@ const ReviewPanelCommentOptions: FC<{
             />
           </BS3Dropdown.Toggle>
           <BS3Dropdown.Menu>
-            <BS3MenuItem onClick={onEdit}>{t('edit')}</BS3MenuItem>
+            {belongsToCurrentUser && (
+              <BS3MenuItem onClick={onEdit}>{t('edit')}</BS3MenuItem>
+            )}
             <BS3MenuItem onClick={onDelete}>{t('delete')}</BS3MenuItem>
           </BS3Dropdown.Menu>
         </ControlledDropdown>
@@ -61,11 +64,13 @@ const ReviewPanelCommentOptions: FC<{
             />
           </DropdownToggle>
           <DropdownMenu flip={false}>
-            <li role="none">
-              <DropdownItem as="button" onClick={onEdit}>
-                {t('edit')}
-              </DropdownItem>
-            </li>
+            {belongsToCurrentUser && (
+              <li role="none">
+                <DropdownItem as="button" onClick={onEdit}>
+                  {t('edit')}
+                </DropdownItem>
+              </li>
+            )}
             <li role="none">
               <DropdownItem as="button" onClick={onDelete}>
                 {t('delete')}
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-message.tsx b/services/web/frontend/js/features/review-panel-new/components/review-panel-message.tsx
index 8cedaa2436..e9fa4ec499 100644
--- a/services/web/frontend/js/features/review-panel-new/components/review-panel-message.tsx
+++ b/services/web/frontend/js/features/review-panel-new/components/review-panel-message.tsx
@@ -12,6 +12,7 @@ import { buildName } from '../utils/build-name'
 import ReviewPanelCommentOptions from './review-panel-comment-options'
 import { ExpandableContent } from './review-panel-expandable-content'
 import ReviewPanelDeleteCommentModal from './review-panel-delete-comment-modal'
+import { useUserContext } from '@/shared/context/user-context'
 
 export const ReviewPanelMessage: FC<{
   message: ReviewPanelCommentThreadMessage
@@ -34,6 +35,7 @@ export const ReviewPanelMessage: FC<{
   const [editing, setEditing] = useState(false)
   const [deleting, setDeleting] = useState(false)
   const [content, setContent] = useState(message.content)
+  const user = useUserContext()
 
   const handleEditOption = useCallback(() => setEditing(true), [])
   const showDeleteModal = useCallback(() => setDeleting(true), [])
@@ -107,6 +109,7 @@ export const ReviewPanelMessage: FC<{
 
           {!isThreadResolved && (
             <ReviewPanelCommentOptions
+              belongsToCurrentUser={user.id === message.user.id}
               onEdit={handleEditOption}
               onDelete={showDeleteModal}
               id={message.id}