diff --git a/.playwright/tests/mentions.spec.ts b/.playwright/tests/mentions.spec.ts
index 56e202b19..49a165bbf 100644
--- a/.playwright/tests/mentions.spec.ts
+++ b/.playwright/tests/mentions.spec.ts
@@ -22,6 +22,7 @@ const sel = {
   setChannelButton: '[data-testid="mention-set-channel-button"]',
   startUserButton: '[data-testid="mention-start-user-button"]',
   startChannelButton: '[data-testid="mention-start-channel-button"]',
+  removeInvalidToggle: '[data-testid="mention-remove-invalid-toggle"]',
 } as const;
 
 async function gotoMentionTest(page: Page): Promise<void> {
@@ -313,3 +314,72 @@ test("inserting a mention between text doesn't produce a double space", async ({
       '<html><p>example <mention text="Jane" indicator="@" id="1">Jane</mention> test</p></html>'
     );
 });
+
+// Inserts "Jane" plus the space setMention adds, then moves the caret
+// `steps` characters left from the end: 1 is right after the mention,
+// 3 is between "Ja" and "ne"
+async function insertMentionAndMoveLeft(
+  page: Page,
+  steps: number
+): Promise<void> {
+  const editor = mentionEditor(page);
+  await editor.click();
+  await editor.pressSequentially('@', { delay: 80 });
+  await page.locator(sel.setUserButton).click();
+  await expect
+    .poll(async () =>
+      (await htmlOutput(page).textContent())?.includes('<mention')
+    )
+    .toBe(true);
+  await editor.press('End');
+  for (let i = 0; i < steps; i++) {
+    await editor.press('ArrowLeft');
+  }
+}
+
+test('typing inside a mention keeps its text by default', async ({ page }) => {
+  await gotoMentionTest(page);
+  await insertMentionAndMoveLeft(page, 3);
+  await mentionEditor(page).press('x');
+  await expect
+    .poll(async () => await htmlOutput(page).textContent())
+    .toEqual('<html><p>Jaxne </p></html>');
+});
+
+test('removeInvalidMentionContent: typing inside a mention removes it', async ({
+  page,
+}) => {
+  await gotoMentionTest(page);
+  await page.locator(sel.removeInvalidToggle).click();
+  await insertMentionAndMoveLeft(page, 3);
+  await mentionEditor(page).press('x');
+  await expect
+    .poll(async () => await htmlOutput(page).textContent())
+    .toEqual('<html><p> </p></html>');
+});
+
+test('removeInvalidMentionContent: backspace inside a mention removes it', async ({
+  page,
+}) => {
+  await gotoMentionTest(page);
+  await page.locator(sel.removeInvalidToggle).click();
+  await insertMentionAndMoveLeft(page, 3);
+  await mentionEditor(page).press('Backspace');
+  await expect
+    .poll(async () => await htmlOutput(page).textContent())
+    .toEqual('<html><p> </p></html>');
+});
+
+test('removeInvalidMentionContent: typing right after a mention keeps it', async ({
+  page,
+}) => {
+  await gotoMentionTest(page);
+  await page.locator(sel.removeInvalidToggle).click();
+  await insertMentionAndMoveLeft(page, 1);
+  await mentionEditor(page).press('x');
+  await expect
+    .poll(async () => await htmlOutput(page).textContent())
+    .toEqual(
+      '<html><p><mention text="Jane" indicator="@" id="1">Jane</mention>x </p></html>'
+    );
+});
diff --git a/android/src/main/java/com/swmansion/enriched/textinput/EnrichedTextInputViewManager.kt b/android/src/main/java/com/swmansion/enriched/textinput/EnrichedTextInputViewManager.kt
index 9cf0293da..202e8e555 100644
--- a/android/src/main/java/com/swmansion/enriched/textinput/EnrichedTextInputViewManager.kt
+++ b/android/src/main/java/com/swmansion/enriched/textinput/EnrichedTextInputViewManager.kt
@@ -177,6 +177,14 @@ class EnrichedTextInputViewManager :
     view?.parametrizedStyles?.mentionIndicators = indicatorsArray
   }
 
+  @ReactProp(name = "removeInvalidMentionContent", defaultBoolean = false)
+  override fun setRemoveInvalidMentionContent(
+    view: EnrichedTextInputView?,
+    removeInvalidMentionContent: Boolean,
+  ) {
+    view?.parametrizedStyles?.removeInvalidMentionContent = removeInvalidMentionContent
+  }
+
   @ReactProp(name = "htmlStyle")
   override fun setHtmlStyle(
     view: EnrichedTextInputView?,
diff --git a/android/src/main/java/com/swmansion/enriched/textinput/styles/ParametrizedStyles.kt b/android/src/main/java/com/swmansion/enriched/textinput/styles/ParametrizedStyles.kt
index 387eec351..d9812a925 100644
--- a/android/src/main/java/com/swmansion/enriched/textinput/styles/ParametrizedStyles.kt
+++ b/android/src/main/java/com/swmansion/enriched/textinput/styles/ParametrizedStyles.kt
@@ -23,6 +23,7 @@ class ParametrizedStyles(
   private var isSettingLinkSpan = false
 
   var mentionIndicators: Array<String> = emptyArray<String>()
+  var removeInvalidMentionContent = false
 
   fun <T> removeSpansForRange(
     spannable: Spannable,
@@ -94,9 +95,27 @@ class ParametrizedStyles(
     endCursorPosition: Int,
   ) {
     afterTextChangedLinks(startCursorPosition, endCursorPosition)
+    // the deletion re-runs this watcher on the final text with fresh positions
+    if (removeInvalidMentionContent && removeInvalidMentions(s)) return
     detectActiveMention(s, startCursorPosition)
   }
 
+  private fun removeInvalidMentions(s: Editable): Boolean {
+    var removed = false
+    for (span in s.getSpans(0, s.length, EnrichedInputMentionSpan::class.java)) {
+      val start = s.getSpanStart(span)
+      val end = s.getSpanEnd(span)
+      // the nested watcher pass may have removed it already
+      if (start == -1) continue
+      if (s.subSequence(start, end).toString() == span.getText()) continue
+
+      s.removeSpan(span)
+      s.delete(start, end)
+      removed = true
+    }
+    return removed
+  }
+
   // Re-runs in-progress mention detection on a pure caret move (no text change),
   fun afterSelectionChangedMentions(
     start: Int,
diff --git a/apps/example-web/src/testScreens/TestMentions.tsx b/apps/example-web/src/testScreens/TestMentions.tsx
index 7cf6dd199..89d792d25 100644
--- a/apps/example-web/src/testScreens/TestMentions.tsx
+++ b/apps/example-web/src/testScreens/TestMentions.tsx
@@ -16,6 +16,8 @@ export function TestMentions() {
   const [detectedText, setDetectedText] = useState('');
   const [detectedIndicator, setDetectedIndicator] = useState('');
   const [lastEndEvent, setLastEndEvent] = useState('');
+  const [removeInvalidMentionContent, setRemoveInvalidMentionContent] =
+    useState(false);
 
   const preventDefault = (e: React.MouseEvent<HTMLButtonElement>) => {
     e.preventDefault();
@@ -31,6 +33,7 @@ export function TestMentions() {
           style={editorStyle}
           htmlStyle={WEB_DEFAULT_HTML_STYLE}
           mentionIndicators={['@', '#']}
+          removeInvalidMentionContent={removeInvalidMentionContent}
           onStartMention={(indicator) => {
             setEventType('start');
             setEventIndicator(indicator);
@@ -112,6 +115,13 @@ export function TestMentions() {
         Start mention (channel)
       </button>
       <button data-testid="mention-blur-target">Blur Editor</button>
+      <button
+        data-testid="mention-remove-invalid-toggle"
+        onMouseDown={preventDefault}
+        onClick={() => setRemoveInvalidMentionContent((value) => !value)}
+      >
+        removeInvalidMentionContent: {String(removeInvalidMentionContent)}
+      </button>
     </div>
   );
 }
diff --git a/apps/example/src/screens/DevScreen.tsx b/apps/example/src/screens/DevScreen.tsx
index d5b4ba3f1..4dcf99d96 100644
--- a/apps/example/src/screens/DevScreen.tsx
+++ b/apps/example/src/screens/DevScreen.tsx
@@ -23,6 +23,8 @@ interface DevScreenProps {
 export function DevScreen({ onSwitch }: DevScreenProps) {
   const editor = useEditorState();
   const [textNodes, setTextNodes] = useState<Array<string>>([]);
+  const [removeInvalidMentionContent, setRemoveInvalidMentionContent] =
+    useState(false);
 
   const handlePushTextNode = async () => {
     const currentText = await editor.ref.current?.getHTML();
@@ -44,6 +46,7 @@ export function DevScreen({ onSwitch }: DevScreenProps) {
           <EnrichedTextInput
             ref={editor.ref}
             mentionIndicators={['@', '#']}
+            removeInvalidMentionContent={removeInvalidMentionContent}
             style={styles.editorInput}
             htmlStyle={htmlStyle}
             placeholder="Type something here..."
@@ -96,6 +99,11 @@ export function DevScreen({ onSwitch }: DevScreenProps) {
             style={styles.button}
           />
         </View>
+        <Button
+          title={`removeInvalidMentionContent: ${removeInvalidMentionContent ? 'on' : 'off'}`}
+          onPress={() => setRemoveInvalidMentionContent((value) => !value)}
+          style={styles.valueButton}
+        />
         <Button
           title="Test Screen"
           onPress={onSwitch}
diff --git a/docs/docs/api-reference/enriched-text-input.md b/docs/docs/api-reference/enriched-text-input.md
index eb4339d43..c465645b2 100644
--- a/docs/docs/api-reference/enriched-text-input.md
+++ b/docs/docs/api-reference/enriched-text-input.md
@@ -575,6 +575,17 @@ A React ref that lets you call any [ref methods](#ref-methods) on the input.
 | ---------------------------------------------- | ------- | ----------------- |
 | `RefObject<EnrichedTextInputInstance \| null>` | -       | Android, iOS, Web |
 
+### `removeInvalidMentionContent` {#removeinvalidmentioncontent}
+
+If `true`, any change to the text of an inserted mention (typing inside it,
+deleting part of it, autocorrect) removes the whole mention. If `false`, the
+changed text stays and is no longer a mention. See
+[Mentions](/rich-text-formatting/mentions#editing-an-inserted-mention).
+
+| Type      | Default | Platforms         |
+| --------- | ------- | ----------------- |
+| `boolean` | `false` | Android, iOS, Web |
+
 ### `returnKeyLabel` {#returnkeylabel}
 
 Overrides the return key label with a custom string.
diff --git a/docs/docs/rich-text-formatting/mentions.mdx b/docs/docs/rich-text-formatting/mentions.mdx
index 17142018d..48caeca87 100644
--- a/docs/docs/rich-text-formatting/mentions.mdx
+++ b/docs/docs/rich-text-formatting/mentions.mdx
@@ -70,6 +70,14 @@ space, and a second space ends it. That makes `@John Doe` a valid mention.
 
 :::
 
+## Editing an inserted mention
+
+When the text of an inserted mention changes - a character typed inside it, a
+part of it deleted, an autocorrect replacement - the text stays and is no
+longer a mention. Set
+[`removeInvalidMentionContent`](/api-reference/enriched-text-input#removeinvalidmentioncontent)
+to remove the whole mention instead.
+
 ## Driving mentions with events
 
 This example is deliberately bare-bones - one hard-coded user behind a button.
diff --git a/ios/EnrichedTextInputView.mm b/ios/EnrichedTextInputView.mm
index 7731542b5..18af286ab 100644
--- a/ios/EnrichedTextInputView.mm
+++ b/ios/EnrichedTextInputView.mm
@@ -730,6 +730,13 @@ - (void)updateProps:(Props::Shared const &)props
     [config setLinkRegexConfig:newRegexConfig];
   }
 
+  // must be set before the default value, which already checks the mentions
+  if (newViewProps.removeInvalidMentionContent !=
+      oldViewProps.removeInvalidMentionContent) {
+    [config setRemoveInvalidMentionContent:newViewProps
+                                               .removeInvalidMentionContent];
+  }
+
   // default value - must be set before placeholder to make sure it correctly
   // shows on first mount
   if (newViewProps.defaultValue != oldViewProps.defaultValue) {
diff --git a/ios/config/EnrichedConfig.h b/ios/config/EnrichedConfig.h
index 7f3234e6c..688140512 100644
--- a/ios/config/EnrichedConfig.h
+++ b/ios/config/EnrichedConfig.h
@@ -23,6 +23,8 @@
 - (UIFont *)monospacedFont;
 - (NSSet<NSNumber *> *)mentionIndicators;
 - (void)setMentionIndicators:(NSSet<NSNumber *> *)newValue;
+- (BOOL)removeInvalidMentionContent;
+- (void)setRemoveInvalidMentionContent:(BOOL)newValue;
 - (CGFloat)h1FontSize;
 - (void)setH1FontSize:(CGFloat)newValue;
 - (BOOL)h1Bold;
diff --git a/ios/config/EnrichedConfig.mm b/ios/config/EnrichedConfig.mm
index fbb1829e4..3cea0439f 100644
--- a/ios/config/EnrichedConfig.mm
+++ b/ios/config/EnrichedConfig.mm
@@ -14,6 +14,7 @@ @implementation EnrichedConfig {
   BOOL _monospacedFontNeedsRecreation;
   BOOL _allowFontScaling;
   NSSet<NSNumber *> *_mentionIndicators;
+  BOOL _removeInvalidMentionContent;
   CGFloat _h1FontSize;
   BOOL _h1Bold;
   CGFloat _h2FontSize;
@@ -83,6 +84,7 @@ - (id)copyWithZone:(NSZone *)zone {
   copy->_monospacedFont = [_monospacedFont copy];
   copy->_allowFontScaling = _allowFontScaling;
   copy->_mentionIndicators = [_mentionIndicators copy];
+  copy->_removeInvalidMentionContent = _removeInvalidMentionContent;
   copy->_h1FontSize = _h1FontSize;
   copy->_h1Bold = _h1Bold;
   copy->_h2FontSize = _h2FontSize;
@@ -230,6 +232,14 @@ - (void)setMentionIndicators:(NSSet<NSNumber *> *)newValue {
   _mentionIndicators = newValue;
 }
 
+- (BOOL)removeInvalidMentionContent {
+  return _removeInvalidMentionContent;
+}
+
+- (void)setRemoveInvalidMentionContent:(BOOL)newValue {
+  _removeInvalidMentionContent = newValue;
+}
+
 - (CGFloat)h1FontSize {
   return [self scaledFontSizeForValue:_h1FontSize];
 }
diff --git a/ios/styles/MentionStyle.mm b/ios/styles/MentionStyle.mm
index aa625c960..78c8d821b 100644
--- a/ios/styles/MentionStyle.mm
+++ b/ios/styles/MentionStyle.mm
@@ -281,6 +281,9 @@ - (void)handleExistingMentions {
 
   // set of ranges to have their mentions removed - aren't valid anymore
   NSMutableSet<NSValue *> *rangesToRemove = [[NSMutableSet alloc] init];
+  // ranges whose text gets deleted, with removeInvalidMentionContent
+  NSMutableArray<NSValue *> *rangesToDelete = [[NSMutableArray alloc] init];
+  MentionParams *lastDeletedParams = nullptr;
 
   for (NSInteger i = 0; i < mentions.count; i++) {
     StylePair *mention = mentions[i];
@@ -295,7 +298,10 @@ - (void)handleExistingMentions {
       if (prevRange.location + prevRange.length == currentRange.location) {
         [rangesToRemove addObject:[NSValue valueWithRange:prevRange]];
         [rangesToRemove addObject:[NSValue valueWithRange:currentRange]];
-        continue;
+        // with removeInvalidMentionContent an edited one still has to go
+        if (![self.host.config removeInvalidMentionContent]) {
+          continue;
+        }
       }
     }
 
@@ -303,13 +309,42 @@ - (void)handleExistingMentions {
     NSString *existingText =
         [self.host.textView.textStorage.string substringWithRange:currentRange];
     if (![existingText isEqualToString:currentText]) {
-      [rangesToRemove addObject:[NSValue valueWithRange:currentRange]];
+      if ([self.host.config removeInvalidMentionContent]) {
+        // text typed inside a mention doesn't get the attribute, so the
+        // mention becomes two runs with the same params; union them so the
+        // typed text goes too
+        if (lastDeletedParams == mention.styleValue) {
+          NSRange lastRange = [rangesToDelete.lastObject rangeValue];
+          rangesToDelete[rangesToDelete.count - 1] =
+              [NSValue valueWithRange:NSUnionRange(lastRange, currentRange)];
+        } else {
+          [rangesToDelete addObject:[NSValue valueWithRange:currentRange]];
+        }
+        lastDeletedParams = mention.styleValue;
+      } else {
+        [rangesToRemove addObject:[NSValue valueWithRange:currentRange]];
+      }
     }
   }
 
   for (NSValue *value in rangesToRemove) {
     [self remove:[value rangeValue] withDirtyRange:YES];
   }
+
+  // mentions are in ascending order, deleting from the end keeps the
+  // earlier ranges valid; the selection is set without focusing the input,
+  // as this also runs when the value is set from JS
+  for (NSValue *value in rangesToDelete.reverseObjectEnumerator) {
+    [TextInsertionUtils replaceText:@""
+                                 at:[value rangeValue]
+               additionalAttributes:nullptr
+                               host:self.host
+                      withSelection:NO];
+  }
+  if (rangesToDelete.count > 0) {
+    self.host.textView.selectedRange =
+        NSMakeRange([rangesToDelete.firstObject rangeValue].location, 0);
+  }
 }
 
 // manages active mention range, which in turn emits proper onMention event
diff --git a/src/native/EnrichedTextInput.tsx b/src/native/EnrichedTextInput.tsx
index 67817c1c9..150d83526 100644
--- a/src/native/EnrichedTextInput.tsx
+++ b/src/native/EnrichedTextInput.tsx
@@ -66,6 +66,7 @@ export const EnrichedTextInput = ({
   autoFocus = false,
   editable = ENRICHED_TEXT_INPUT_DEFAULT_PROPS.editable,
   mentionIndicators = ENRICHED_TEXT_INPUT_DEFAULT_PROPS.mentionIndicators.slice(),
+  removeInvalidMentionContent = false,
   defaultValue,
   placeholder,
   placeholderTextColor,
@@ -374,6 +375,7 @@ export const EnrichedTextInput = ({
     <EnrichedTextInputNativeComponent
       ref={nativeRef}
       mentionIndicators={mentionIndicators}
+      removeInvalidMentionContent={removeInvalidMentionContent}
       editable={editable}
       autoFocus={autoFocus}
       defaultValue={defaultValue}
diff --git a/src/spec/EnrichedTextInputNativeComponent.ts b/src/spec/EnrichedTextInputNativeComponent.ts
index 0f90daaf9..e7e2c041c 100644
--- a/src/spec/EnrichedTextInputNativeComponent.ts
+++ b/src/spec/EnrichedTextInputNativeComponent.ts
@@ -375,6 +375,7 @@ export interface NativeProps extends ViewProps {
   placeholder?: string;
   placeholderTextColor?: ColorValue;
   mentionIndicators: string[];
+  removeInvalidMentionContent?: boolean;
   cursorColor?: ColorValue;
   selectionColor?: ColorValue;
   autoCapitalize?: string;
diff --git a/src/types.ts b/src/types.ts
index fbe606487..6e020c2f8 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -670,6 +670,13 @@ export interface EnrichedTextInputProps extends Omit<ViewProps, 'children'> {
    */
   mentionIndicators?: string[];
 
+  /**
+   * If `true`, any change to the text of an inserted mention (typing inside it,
+   * deleting part of it, autocorrect) removes the whole mention. If `false`, the
+   * changed text stays and is no longer a mention. Defaults to `false`.
+   */
+  removeInvalidMentionContent?: boolean;
+
   /**
    * Initial content rendered when the component mounts.
    * Use `ref.setValue()` to update the content imperatively.
diff --git a/src/web/EnrichedTextInput.tsx b/src/web/EnrichedTextInput.tsx
index 9f186965e..14eb124ff 100644
--- a/src/web/EnrichedTextInput.tsx
+++ b/src/web/EnrichedTextInput.tsx
@@ -106,6 +106,7 @@ export const EnrichedTextInput = ({
   autoCapitalize = ENRICHED_TEXT_INPUT_DEFAULT_PROPS.autoCapitalize,
   scrollEnabled = ENRICHED_TEXT_INPUT_DEFAULT_PROPS.scrollEnabled,
   mentionIndicators = ENRICHED_TEXT_INPUT_DEFAULT_PROPS.mentionIndicators.slice(),
+  removeInvalidMentionContent = false,
   onFocus,
   style,
   onBlur,
@@ -158,6 +159,9 @@ export const EnrichedTextInput = ({
   const htmlStyleRef = useStableRef(resolvedHtmlStyle);
   const onPasteImagesRef = useStableRef(onPasteImages);
   const mentionIndicatorsRef = useStableRef(mentionIndicators);
+  const removeInvalidMentionContentRef = useStableRef(
+    removeInvalidMentionContent
+  );
   const submitBehaviorRef = useStableRef(submitBehavior);
   const onSubmitEditingRef = useStableRef(onSubmitEditing);
   const onKeyPressRef = useStableRef(onKeyPress);
@@ -239,6 +243,8 @@ export const EnrichedTextInput = ({
       StrictMarksPlugin,
       MentionPlugin.configure({
         getIndicators: () => mentionIndicatorsRef.current,
+        getRemoveInvalidMentionContent: () =>
+          removeInvalidMentionContentRef.current,
       }),
       ShortcutPlugin.configure({
         getHtmlStyle: () => htmlStyleRef.current,
@@ -255,7 +261,13 @@ export const EnrichedTextInput = ({
         showOnlyWhenEditable: true,
       }),
     ],
-    [placeholder, htmlStyleRef, mentionIndicatorsRef, textShortcutsRef]
+    [
+      placeholder,
+      htmlStyleRef,
+      mentionIndicatorsRef,
+      removeInvalidMentionContentRef,
+      textShortcutsRef,
+    ]
   );
 
   const editor = useEditor(
diff --git a/src/web/__tests__/removeMentionMarksIfSpansResized.test.ts b/src/web/__tests__/removeMentionMarksIfSpansResized.test.ts
new file mode 100644
index 000000000..33b24c8cc
--- /dev/null
+++ b/src/web/__tests__/removeMentionMarksIfSpansResized.test.ts
@@ -0,0 +1,102 @@
+import { Schema } from '@tiptap/pm/model';
+import { EditorState, type Transaction } from '@tiptap/pm/state';
+import { removeMentionMarksIfSpansResized } from '../pmPlugins/MentionPlugin/removeMentionMarksIfSpansResized';
+
+const schema = new Schema({
+  nodes: {
+    doc: { content: 'paragraph+' },
+    paragraph: { content: 'text*' },
+    text: {},
+  },
+  marks: {
+    mention: { attrs: { text: {} }, inclusive: false },
+  },
+});
+
+const mention = (text: string) =>
+  schema.text(text, [schema.marks.mention!.create({ text })]);
+
+// "Hi @Jane and @John " with both names as mentions
+function initialState() {
+  const doc = schema.node('doc', null, [
+    schema.node('paragraph', null, [
+      schema.text('Hi '),
+      mention('@Jane'),
+      schema.text(' and '),
+      mention('@John'),
+      schema.text(' '),
+    ]),
+  ]);
+  return EditorState.create({ doc });
+}
+
+function run(
+  edit: (state: EditorState) => Transaction,
+  removeContent: boolean
+) {
+  const oldState = initialState();
+  const tr = edit(oldState);
+  const newState = oldState.apply(tr);
+  const fix = removeMentionMarksIfSpansResized(
+    [tr],
+    oldState,
+    newState,
+    removeContent
+  );
+  const finalState = fix ? newState.apply(fix) : newState;
+  return { fix, doc: finalState.doc };
+}
+
+const mentionTexts = (doc: EditorState['doc']) => {
+  const texts: string[] = [];
+  doc.descendants((node) => {
+    if (node.isText && schema.marks.mention!.isInSet(node.marks)) {
+      texts.push(node.text!);
+    }
+  });
+  return texts;
+};
+
+// positions: paragraph starts at 1, so "@Jane" covers 4..9 and "@John" 14..19
+const typeInsideJane = (state: EditorState) => state.tr.insertText('x', 6);
+
+describe('removeMentionMarksIfSpansResized', () => {
+  test('keeps the text and drops the mark by default', () => {
+    const { doc } = run(typeInsideJane, false);
+
+    expect(doc.textContent).toBe('Hi @Jxane and @John ');
+    expect(mentionTexts(doc)).toEqual(['@John']);
+  });
+
+  test('removes the whole mention with removeContent', () => {
+    const { doc } = run(typeInsideJane, true);
+
+    expect(doc.textContent).toBe('Hi  and @John ');
+    expect(mentionTexts(doc)).toEqual(['@John']);
+  });
+
+  test('removes the mention when a character inside it is deleted', () => {
+    const { doc } = run((state) => state.tr.delete(6, 7), true);
+
+    expect(doc.textContent).toBe('Hi  and @John ');
+  });
+
+  test('removes a mention when a character is replaced, like autocorrect', () => {
+    const { doc } = run((state) => state.tr.insertText('k', 7, 8), true);
+
+    expect(doc.textContent).toBe('Hi  and @John ');
+  });
+
+  test('ignores typing right after a mention', () => {
+    const { fix } = run((state) => state.tr.insertText('x', 9), true);
+
+    expect(fix).toBeNull();
+  });
+
+  test('removes two changed mentions in one edit', () => {
+    const { doc } = run((state) => state.tr.delete(8, 16), true);
+
+    expect(doc.textContent).toBe('Hi  ');
+    expect(mentionTexts(doc)).toEqual([]);
+  });
+});
diff --git a/src/web/pmPlugins/MentionPlugin/index.ts b/src/web/pmPlugins/MentionPlugin/index.ts
index d6b07bbfa..0e6844d5b 100644
--- a/src/web/pmPlugins/MentionPlugin/index.ts
+++ b/src/web/pmPlugins/MentionPlugin/index.ts
@@ -22,6 +22,7 @@ export const MentionPlugin = Extension.create<MentionPluginOptions>({
           'MentionPlugin.configure({ getIndicators }) is required'
         );
       },
+      getRemoveInvalidMentionContent: () => false,
     };
   },
   addProseMirrorPlugins() {
@@ -38,7 +39,13 @@ export const MentionPlugin = Extension.create<MentionPluginOptions>({
           },
         },
         state: makeMentionPluginState(this.options.getIndicators),
-        appendTransaction: removeMentionMarksIfSpansResized,
+        appendTransaction: (transactions, oldState, newState) =>
+          removeMentionMarksIfSpansResized(
+            transactions,
+            oldState,
+            newState,
+            this.options.getRemoveInvalidMentionContent()
+          ),
       }),
     ];
   },
diff --git a/src/web/pmPlugins/MentionPlugin/removeMentionMarksIfSpansResized.ts b/src/web/pmPlugins/MentionPlugin/removeMentionMarksIfSpansResized.ts
index 00bc66003..87326d8c0 100644
--- a/src/web/pmPlugins/MentionPlugin/removeMentionMarksIfSpansResized.ts
+++ b/src/web/pmPlugins/MentionPlugin/removeMentionMarksIfSpansResized.ts
@@ -6,7 +6,8 @@ export type MentionMarkRange = { from: number; to: number; mark: Mark };
 export function removeMentionMarksIfSpansResized(
   transactions: readonly Transaction[],
   oldState: EditorState,
-  newState: EditorState
+  newState: EditorState,
+  removeContent: boolean
 ): Transaction | null {
   if (!transactions.some((tr) => tr.docChanged)) return null;
 
@@ -30,8 +31,19 @@ export function removeMentionMarksIfSpansResized(
       newTo = t.mapping.map(newTo, -1);
     }
 
-    if (newTo - newFrom !== origLen) {
-      tr.removeMark(newFrom, newTo, mark.type);
+    const resized = newTo - newFrom !== origLen;
+    const edited =
+      removeContent &&
+      newState.doc.textBetween(newFrom, newTo) !==
+        oldState.doc.textBetween(from, to);
+
+    if (resized || edited) {
+      if (removeContent) {
+        // earlier deletions in this transaction shift the positions
+        tr.delete(tr.mapping.map(newFrom), tr.mapping.map(newTo));
+      } else {
+        tr.removeMark(newFrom, newTo, mark.type);
+      }
       changed = true;
     }
   }
diff --git a/src/web/pmPlugins/MentionPlugin/types.ts b/src/web/pmPlugins/MentionPlugin/types.ts
index 2287cef0d..31048dc91 100644
--- a/src/web/pmPlugins/MentionPlugin/types.ts
+++ b/src/web/pmPlugins/MentionPlugin/types.ts
@@ -12,6 +12,7 @@ export type TriggerState =
 
 export interface MentionPluginOptions {
   getIndicators: () => string[];
+  getRemoveInvalidMentionContent: () => boolean;
 }
 
 export interface MentionCallbacks {