diff --git a/src/Services/MessagingService.cs b/src/Services/MessagingService.cs
index b419477..54d0daa 100644
--- a/src/Services/MessagingService.cs
+++ b/src/Services/MessagingService.cs
@@ -77,7 +77,7 @@ public class MessagingService
         ctx.SaveChanges();
 
         // update receiving users messages
-        if (messageTypeID != MessageTypeID.BuddyList) // probably shouldn't recheck message queue for buddylist messages
+        if (messageTypeID != MessageTypeID.BuddyList && viking != null && viking.Id != toViking.Id) // probably shouldn't recheck message queue for buddylist messages
         {
             mMOClientService.SendCommandToUser(toViking.Uid.ToString(), "SPMN", new string[] { "SPMN" });
             mMOClientService.SendCommandToUser(toViking.Uid.ToString(), "NMP", new string[] { "NMP", "-1", "1", "1" });