diff --git a/src/components/mention_link/mention_link.js b/src/components/mention_link/mention_link.js
index d4d8e0f96b13ff531c18caa03b6ec5c67827e834..ca5c24618fd59b64d9dbd7ce25fe27a4fffd4ace 100644
--- a/src/components/mention_link/mention_link.js
+++ b/src/components/mention_link/mention_link.js
@@ -117,9 +117,6 @@ const MentionLink = {
         this.highlightType
       ]
     },
-    useAtIcon () {
-      return this.mergedConfig.useAtIcon
-    },
     isRemote () {
       return this.userName !== this.userNameFull
     },
diff --git a/src/components/mention_link/mention_link.vue b/src/components/mention_link/mention_link.vue
index 5db837a256028216ead80527246d124c8873878b..0452cad58cc508ba262f2940a2309056d30868cc 100644
--- a/src/components/mention_link/mention_link.vue
+++ b/src/components/mention_link/mention_link.vue
@@ -34,12 +34,7 @@
             :user="user"
           /><span
             class="shortName"
-          ><FAIcon
-            v-if="useAtIcon"
-            size="sm"
-            icon="at"
-            class="at"
-          />{{ !useAtIcon ? '@' : '' }}<span
+          >@<span
             class="userName"
             v-html="userName"
           /><span
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index c8db96c5e798eaf49d4de5e0e4ccbb8af8749abf..02396114f8a5c3ff26edaf7470b5baac6caf16e9 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -365,14 +365,6 @@
             {{ $t('settings.mention_link_use_tooltip') }}
           </BooleanSetting>
         </li>
-        <li>
-          <BooleanSetting
-            path="useAtIcon"
-            expert="1"
-          >
-            {{ $t('settings.use_at_icon') }}
-          </BooleanSetting>
-        </li>
         <li>
           <BooleanSetting path="mentionLinkShowAvatar">
             {{ $t('settings.mention_link_show_avatar') }}
diff --git a/src/modules/default_config_state.js b/src/modules/default_config_state.js
index 388eb50996e229390a1f12fd90d3323d83586c6c..2baa752a6523844a25867ab4894d638b3194b3e7 100644
--- a/src/modules/default_config_state.js
+++ b/src/modules/default_config_state.js
@@ -129,7 +129,6 @@ export const defaultState = {
   forcedRoundness: undefined, // instance default
   navbarColumnStretch: false,
   greentext: undefined, // instance default
-  useAtIcon: undefined, // instance default
   mentionLinkDisplay: undefined, // instance default
   mentionLinkShowTooltip: undefined, // instance default
   mentionLinkShowAvatar: undefined, // instance default
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 6f12089f4796b24c921096c6393d0e7807c5d8d5..38f6e76790e5ef92066fef544ca4301e62cca4be 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -57,7 +57,6 @@ const defaultState = {
   embeddedToS: true,
   collapseMessageWithSubject: false,
   greentext: false,
-  useAtIcon: false,
   mentionLinkDisplay: 'short',
   mentionLinkShowTooltip: true,
   mentionLinkShowAvatar: false,