diff --git a/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java b/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java
index 8e5980cb..7d27290f 100644
--- a/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java
+++ b/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java
@@ -75,11 +75,14 @@ public class HandleFriendRequestHandler extends IMHandler<WFCMessage.HandleFrien
                         builder.setServerTimestamp(timestamp);
                         saveAndPublish(request.getTargetUid(), null, builder.build(), false);
 
-                        publisher.publishNotification(IMTopic.NotifyFriendTopic, request.getTargetUid(), heads[0]);
-                        publisher.publishNotification(IMTopic.NotifyFriendTopic, fromUser, heads[1]);
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
+
+                    if (request.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Accepted || isAdmin) {
+                        publisher.publishNotification(IMTopic.NotifyFriendTopic, request.getTargetUid(), heads[0]);
+                        publisher.publishNotification(IMTopic.NotifyFriendTopic, fromUser, heads[1]);
+                    }
                 }
             }
             return errorCode;