1 files changed, 2 insertions, 1 deletions
diff --git a/webapp/components/rhs_comment.jsx b/webapp/components/rhs_comment.jsx
index 5097e0573..c4b62efcf 100644
--- a/webapp/components/rhs_comment.jsx
+++ b/webapp/components/rhs_comment.jsx
@@ -85,6 +85,7 @@ export default class RhsComment extends React.Component {
 
         const isOwner = this.props.currentUser.id === post.user_id;
         var isAdmin = TeamStore.isTeamAdminForCurrentTeam() || UserStore.isSystemAdminForCurrentUser();
+        const isSystemMessage = post.type.startsWith(Constants.SYSTEM_MESSAGE_PREFIX);
 
         var dropdownContents = [];
 
@@ -107,7 +108,7 @@ export default class RhsComment extends React.Component {
             );
         }
 
-        if (isOwner) {
+        if (isOwner && !isSystemMessage) {
             dropdownContents.push(
                 <li
                     role='presentation'