diff --git a/Source/Game/Calendar/CalendarManager.cs b/Source/Game/Calendar/CalendarManager.cs
index 1ffc17dd7..c56afec3b 100644
--- a/Source/Game/Calendar/CalendarManager.cs
+++ b/Source/Game/Calendar/CalendarManager.cs
@@ -473,7 +473,7 @@ namespace Game
             var packetBuilder = (Player receiver) =>
             {
                 CalendarEventUpdatedAlert packet = new();
-                packet.ClearPending = true; // FIXME
+                packet.ClearPending = calendarEvent.OwnerGuid == receiver.GetGUID();
                 packet.Date.SetUtcTimeFromUnixTime(calendarEvent.Date);
                 packet.Date += receiver.GetSession().GetTimezoneOffset();
                 packet.Description = calendarEvent.Description;
@@ -500,7 +500,7 @@ namespace Game
             var packetBuilder = (Player receiver) =>
             {
                 CalendarInviteStatusPacket packet = new();
-                packet.ClearPending = true; // FIXME
+                packet.ClearPending = invite.InviteeGuid == receiver.GetGUID();
                 packet.Date.SetUtcTimeFromUnixTime(calendarEvent.Date);
                 packet.Date += receiver.GetSession().GetTimezoneOffset();
                 packet.EventID = calendarEvent.EventId;
@@ -522,7 +522,7 @@ namespace Game
             var packetBuilder = (Player receiver) =>
             {
                 CalendarEventRemovedAlert packet = new();
-                packet.ClearPending = true; // FIXME
+                packet.ClearPending = calendarEvent.OwnerGuid == receiver.GetGUID();
                 packet.Date.SetUtcTimeFromUnixTime(calendarEvent.Date);
                 packet.Date += receiver.GetSession().GetTimezoneOffset();
                 packet.EventID = calendarEvent.EventId;
diff --git a/Source/Game/Handlers/CalendarHandler.cs b/Source/Game/Handlers/CalendarHandler.cs
index 538f995ac..cbaeaa1d9 100644
--- a/Source/Game/Handlers/CalendarHandler.cs
+++ b/Source/Game/Handlers/CalendarHandler.cs
@@ -175,9 +175,6 @@ namespace Game
         [WorldPacketHandler(ClientOpcodes.CalendarUpdateEvent)]
         void HandleCalendarUpdateEvent(CalendarUpdateEvent calendarUpdateEvent)
         {
-            ObjectGuid guid = GetPlayer().GetGUID();
-            long oldEventTime;
-
             calendarUpdateEvent.EventInfo.Time -= GetTimezoneOffset();
 
             // prevent events in the past
@@ -187,7 +184,7 @@ namespace Game
             CalendarEvent calendarEvent = Global.CalendarMgr.GetEvent(calendarUpdateEvent.EventInfo.EventID);
             if (calendarEvent != null)
             {
-                oldEventTime = calendarEvent.Date;
+                long oldEventTime = calendarEvent.Date;
 
                 calendarEvent.EventType = (CalendarEventType)calendarUpdateEvent.EventInfo.EventType;
                 calendarEvent.Flags = (CalendarFlags)calendarUpdateEvent.EventInfo.Flags;
@@ -200,7 +197,7 @@ namespace Game
                 Global.CalendarMgr.SendCalendarEventUpdateAlert(calendarEvent, oldEventTime);
             }
             else
-                Global.CalendarMgr.SendCalendarCommandResult(guid, CalendarError.EventInvalid);
+                Global.CalendarMgr.SendCalendarCommandResult(_player.GetGUID(), CalendarError.EventInvalid);
         }
 
         [WorldPacketHandler(ClientOpcodes.CalendarRemoveEvent)]