diff --git a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
index a7c664f6..bf5b4690 100755
--- a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
+++ b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
@@ -1694,6 +1694,7 @@ public class MemoryMessagesStore implements IMessagesStore {
         if (friendData == null) {
             return ErrorCode.ERROR_CODE_NOT_EXIST;
         }
+        friendsMap.remove(fromUser, friendData);
 
         friendData.setAlias(alias);
         friendData.setTimestamp(System.currentTimeMillis());