diff --git a/src/components/extra_buttons/extra_buttons.js b/src/components/extra_buttons/extra_buttons.js
index 347a4552..9569ab04 100644
--- a/src/components/extra_buttons/extra_buttons.js
+++ b/src/components/extra_buttons/extra_buttons.js
@@ -194,11 +194,11 @@ const ExtraButtons = {
       }
     },
     showFediLinks () {
-      return this.$store.getters.mergedConfig.showFediLinks === true && this.status.visibility != 'direct'
+      return this.$store.getters.mergedConfig.showFediLinks === true
     },
     fediLinkURL () {
       try {
-        return this.statusLink.replace(/^https?/, 'web+ap')
+        return this.status.external_uri.replace(/^https?/, 'web+ap')
       } catch (e) {
         return null
       }
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 4fddd875..6780a48b 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -316,6 +316,7 @@ export const parseStatus = (data) => {
 
     output.summary_raw_html = escape(data.spoiler_text)
     output.external_url = data.url
+    output.external_uri = data.uri
     output.poll = data.poll
     if (output.poll) {
       output.poll.options = (output.poll.options || []).map(field => ({