diff --git a/js/models/messages.js b/js/models/messages.js
index 7867b6975..c142403cf 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -648,14 +648,16 @@
         isP2p: !!this.get('isP2p'),
         isPublic: !!this.get('isPublic'),
         isRss: !!this.get('isRss'),
-        isModerator:
+        senderIsModerator:
           !!this.get('isPublic') &&
-          this.getConversation().isModerator(this.getSource()),
+          conversation &&
+          conversation.isModerator(phoneNumber),
         isDeletable:
           !this.get('isPublic') ||
-          this.getConversation().isModerator(this.OUR_NUMBER) ||
+          conversation && conversation.isModerator(this.OUR_NUMBER) ||
           this.getSource() === this.OUR_NUMBER,
-        hasModPerms: this.getConversation().isModerator(this.OUR_NUMBER),
+        hasModPerms:
+          conversation && !!conversation.isModerator(this.OUR_NUMBER),
 
         onCopyText: () => this.copyText(),
         onSelectMessage: () => this.selectMessage(),
diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx
index 6313d4f38..e9d7bc739 100644
--- a/ts/components/conversation/Message.tsx
+++ b/ts/components/conversation/Message.tsx
@@ -55,7 +55,7 @@ interface LinkPreviewType {
 
 export interface Props {
   disableMenu?: boolean;
-  isModerator?: boolean;
+  senderIsModerator?: boolean;
   isDeletable: boolean;
   hasModPerms?: boolean;
   text?: string;
@@ -212,9 +212,13 @@ export class Message extends React.PureComponent<Props, State> {
   }
 
   public renderMetadataBadges() {
-    const { direction, isP2p, isPublic, isModerator } = this.props;
+    const { direction, isP2p, isPublic, senderIsModerator } = this.props;
 
-    const badges = [isPublic && 'Public', isP2p && 'P2p', isModerator && 'Mod'];
+    const badges = [
+      isPublic && 'Public',
+      isP2p && 'P2p',
+      senderIsModerator && 'Mod',
+    ];
 
     return badges
       .map(badgeText => {
@@ -657,7 +661,7 @@ export class Message extends React.PureComponent<Props, State> {
       authorPhoneNumber,
       authorProfileName,
       collapseMetadata,
-      isModerator,
+      senderIsModerator,
       authorColor,
       conversationType,
       direction,
@@ -684,7 +688,7 @@ export class Message extends React.PureComponent<Props, State> {
           profileName={authorProfileName}
           size={36}
         />
-        {isModerator && (
+        {senderIsModerator && (
           <div className="module-avatar__icon--crown-wrapper">
             <div className="module-avatar__icon--crown" />
           </div>