diff --git a/src/components/chat_title/chat_title.vue b/src/components/chat_title/chat_title.vue
index 72660cca0..00521260f 100644
--- a/src/components/chat_title/chat_title.vue
+++ b/src/components/chat_title/chat_title.vue
@@ -19,6 +19,7 @@
       :title="'@'+(user && user.screen_name_ui)"
       :html="htmlTitle"
       :emoji="user.emoji || []"
+      :is-local="user.is_local"
     />
   </div>
 </template>
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index 0930e0990..648bdb41f 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -62,6 +62,7 @@
                 :title="'@'+notification.from_profile.screen_name_ui"
                 :html="notification.from_profile.name_html"
                 :emoji="notification.from_profile.emoji"
+                :is-local="notification.from_profile.is_local"
               />
             </bdi>
             <!-- eslint-enable vue/no-v-html -->
diff --git a/src/components/rich_content/rich_content.jsx b/src/components/rich_content/rich_content.jsx
index ac04c538e..cdad60f74 100644
--- a/src/components/rich_content/rich_content.jsx
+++ b/src/components/rich_content/rich_content.jsx
@@ -86,6 +86,12 @@ export default {
       required: false,
       type: Boolean,
       default: false
+    },
+    // Assume is local to be true if unspecified, so the button isn't show where it probably should not be
+    isLocal: {
+      required: false,
+      type: Boolean,
+      default: true
     }
   },
   // NEVER EVER TOUCH DATA INSIDE RENDER
@@ -165,9 +171,11 @@ export default {
               return <StillImageEmojiPopover
                 class="emoji img"
                 src={url}
-                shortcode={shortcode}
                 title={`:${shortcode}:`}
                 alt={`:${shortcode}:`}
+
+                shortcode={shortcode}
+                isLocal={this.isLocal}
               />
             }
           )]
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index d0af91aef..fbc455ee6 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -79,6 +79,7 @@
               <RichContent
                 :html="retweeterHtml"
                 :emoji="retweeterUser.emoji"
+                :is-local="retweeterUser.is_local"
               />
             </router-link>
             <router-link
@@ -139,6 +140,7 @@
                   <RichContent
                     :html="status.user.name"
                     :emoji="status.user.emoji"
+                    :is-local="status.user.is_local"
                   />
                 </h4>
                 <h4
diff --git a/src/components/status_body/status_body.vue b/src/components/status_body/status_body.vue
index 0fc024b04..6f1c3c747 100644
--- a/src/components/status_body/status_body.vue
+++ b/src/components/status_body/status_body.vue
@@ -14,6 +14,7 @@
           :faint="compact"
           :html="status.summary_raw_html"
           :emoji="status.emojis"
+          :is-local="status.isLocal"
         />
         <button
           v-show="longSubject && showingLongSubject"
@@ -44,6 +45,7 @@
           :faint="compact"
           :greentext="mergedConfig.greentext"
           :attentions="status.attentions"
+          :is-local="status.is_local"
           @parse-ready="onParseReady"
         />
         <div
diff --git a/src/components/still-image/still-image-emoji-popover.vue b/src/components/still-image/still-image-emoji-popover.vue
index 0e8a68171..a5459bc79 100644
--- a/src/components/still-image/still-image-emoji-popover.vue
+++ b/src/components/still-image/still-image-emoji-popover.vue
@@ -3,7 +3,6 @@
     ref="emojiPopover"
     trigger="click"
     placement="top"
-    bound-to-selector=".status-container"
     :bound-to="{ x: 'container' }"
     :offset="{ y: 10 }"
     @show="fetchEmojiPacksIfAdmin"
@@ -22,7 +21,7 @@
           />
         </div>
 
-        <div v-if="isUserAdmin">
+        <div v-if="isUserAdmin && !isLocal">
           <button
             class="button button-default btn emoji-popover-button"
             type="button"
@@ -66,6 +65,16 @@
 
   export default {
     components: { StillImage, Popover, SelectComponent },
+    props: {
+      shortcode: {
+        type: String,
+        required: true
+      },
+      isLocal: {
+        type: Boolean,
+        required: true
+      }
+    },
     data() {
       return {
         knownLocalPacks: { },