diff --git a/app/src/main/java/com/bitchat/android/ui/CommandProcessor.kt b/app/src/main/java/com/bitchat/android/ui/CommandProcessor.kt
index ab0b33a0..b811c9c8 100644
--- a/app/src/main/java/com/bitchat/android/ui/CommandProcessor.kt
+++ b/app/src/main/java/com/bitchat/android/ui/CommandProcessor.kt
@@ -564,7 +564,7 @@ class CommandProcessor(
                 null -> {
                     meshMentionCandidates(
                         peerNicknames = meshService.getPeerNicknames(),
-                        myPeerID = meshService.myPeerID,
+                        myPeerID = meshService.myPeerID.orEmpty(),
                         isPeerBlocked = privateChatManager::isPeerBlocked
                     )
                 }
@@ -601,7 +601,7 @@ class CommandProcessor(
         } else {
             meshMentionCandidates(
                 peerNicknames = meshService.getPeerNicknames(),
-                myPeerID = meshService.myPeerID,
+                myPeerID = meshService.myPeerID.orEmpty(),
                 isPeerBlocked = privateChatManager::isPeerBlocked
             )
         }