diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
index 433e7728c1..74a9ecaf77 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
@@ -162,7 +162,7 @@ export default class PreferencesUserSettingsTab extends React.Component<IProps,
         'MessageComposerInput.ctrlEnterToSend',
         'MessageComposerInput.surroundWith',
         'MessageComposerInput.showStickersButton',
-        'MessageComposerInput.insertTrailingComma',
+        'MessageComposerInput.insertTrailingColon',
     ];
 
     static TIME_SETTINGS = [
diff --git a/src/editor/parts.ts b/src/editor/parts.ts
index 415ee167bb..b8cf61a1e2 100644
--- a/src/editor/parts.ts
+++ b/src/editor/parts.ts
@@ -651,7 +651,7 @@ export class PartCreator {
         userId: string,
     ): [UserPillPart, PlainPart] {
         const pill = this.userPill(displayName, userId);
-        if (!SettingsStore.getValue("MessageComposerInput.insertTrailingComma")) {
+        if (!SettingsStore.getValue("MessageComposerInput.insertTrailingColon")) {
             insertTrailingCharacter = false;
         }
         const postfix = this.plain(insertTrailingCharacter ? ": " : " ");
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
index a57a88ab28..5d1d3a1c03 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -429,7 +429,7 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         default: true,
         controller: new UIFeatureController(UIFeature.Widgets, false),
     },
-    "MessageComposerInput.insertTrailingComma": {
+    "MessageComposerInput.insertTrailingColon": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td('Insert a trailing colon after user mentions at the start of a message'),
         default: true,
diff --git a/src/settings/handlers/AccountSettingsHandler.ts b/src/settings/handlers/AccountSettingsHandler.ts
index 39999a1cd6..d1a2c6c622 100644
--- a/src/settings/handlers/AccountSettingsHandler.ts
+++ b/src/settings/handlers/AccountSettingsHandler.ts
@@ -121,7 +121,7 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
             return content[settingName];
         }
 
-        if (settingName === "MessageComposerInput.insertTrailingComma") {
+        if (settingName === "MessageComposerInput.insertTrailingColon") {
             const content = this.getSettings() || {};
             const value = content[settingName];
             if (value === null || value === undefined) {