diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/PersonMentionPropagationListener.java b/backend/src/main/java/org/raddatz/familienarchiv/service/PersonMentionPropagationListener.java
index 9258edb7..84c297e2 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/service/PersonMentionPropagationListener.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/service/PersonMentionPropagationListener.java
@@ -11,6 +11,8 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * Transcription-domain consumer of {@link PersonDisplayNameChangedEvent}. When
@@ -49,10 +51,18 @@ public class PersonMentionPropagationListener {
 
         String oldNeedle = "@" + event.oldDisplayName();
         String newNeedle = "@" + event.newDisplayName();
+        // Match @OldName only at a token boundary: not followed by a letter/digit/hyphen
+        // (catches @Hans-Peter when renaming Hans) AND not followed by " <Uppercase>"
+        // (catches @Hans Müller when renaming the single-name @Hans). False negatives —
+        // e.g. "@Hans Bekam" where Bekam is sentence-initial — are accepted as the
+        // conservative trade-off; the alternative (corruption) is irrecoverable.
+        Pattern boundary = Pattern.compile(
+                Pattern.quote(oldNeedle) + "(?![\\p{L}0-9\\-]| (?=\\p{Lu}))");
+        String replacement = Matcher.quoteReplacement(newNeedle);
 
         for (TranscriptionBlock block : blocks) {
             if (block.getText() != null) {
-                block.setText(block.getText().replace(oldNeedle, newNeedle));
+                block.setText(boundary.matcher(block.getText()).replaceAll(replacement));
             }
             for (PersonMention mention : block.getMentionedPersons()) {
                 if (mention.getPersonId().equals(event.personId())) {
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/PersonMentionPropagationListenerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/service/PersonMentionPropagationListenerTest.java
index 33bd0830..078b80f7 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/service/PersonMentionPropagationListenerTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/service/PersonMentionPropagationListenerTest.java
@@ -123,6 +123,32 @@ class PersonMentionPropagationListenerTest {
                         org.assertj.core.groups.Tuple.tuple(hansId, "Hans Schmidt"));
     }
 
+    @Test
+    void doesNotCorruptCompositeMention_whenRenamingSingleWordPerson() {
+        UUID hansMüllerId = savedPersonId("Hans", "Müller");
+        UUID hansId = savedPersonId(null, "Hans");
+        TranscriptionBlock saved = saveBlock(
+                "@Hans Müller schrieb. Auch @Hans hat geschrieben.",
+                List.of(
+                        new PersonMention(hansMüllerId, "Hans Müller"),
+                        new PersonMention(hansId, "Hans")));
+        em.clear();
+
+        listener.onPersonDisplayNameChanged(
+                new PersonDisplayNameChangedEvent(hansId, "Hans", "Henry"));
+        blockRepository.flush();
+        em.clear();
+
+        TranscriptionBlock reloaded = blockRepository.findById(saved.getId()).orElseThrow();
+        assertThat(reloaded.getText())
+                .isEqualTo("@Hans Müller schrieb. Auch @Henry hat geschrieben.");
+        assertThat(reloaded.getMentionedPersons())
+                .extracting(PersonMention::getPersonId, PersonMention::getDisplayName)
+                .containsExactlyInAnyOrder(
+                        org.assertj.core.groups.Tuple.tuple(hansMüllerId, "Hans Müller"),
+                        org.assertj.core.groups.Tuple.tuple(hansId, "Henry"));
+    }
+
     @Test
     void rewritesAllOccurrences_whenSameMentionAppearsTwiceInBlock() {
         UUID personId = savedPersonId("Auguste", "Raddatz");