diff --git a/Source/Game/Handlers/QuestHandler.cs b/Source/Game/Handlers/QuestHandler.cs
index 1cfc186cd..cff33e6b3 100644
--- a/Source/Game/Handlers/QuestHandler.cs
+++ b/Source/Game/Handlers/QuestHandler.cs
@@ -728,15 +728,18 @@ namespace Game
 
                 sender.SendPushToPartyResponse(receiver, QuestPushReason.Success);
 
-                if (quest.IsAutoAccept() && receiver.CanAddQuest(quest, true) && receiver.CanTakeQuest(quest, true))
-                    receiver.AddQuestAndCheckCompletion(quest, sender);
-
                 if ((quest.IsAutoComplete() && quest.IsRepeatable() && !quest.IsDailyOrWeekly()) || quest.HasFlag(QuestFlags.AutoComplete))
                     receiver.PlayerTalkClass.SendQuestGiverRequestItems(quest, sender.GetGUID(), receiver.CanCompleteRepeatableQuest(quest), true);
                 else
                 {
                     receiver.SetQuestSharingInfo(sender.GetGUID(), quest.Id);
                     receiver.PlayerTalkClass.SendQuestGiverQuestDetails(quest, receiver.GetGUID(), true, false);
+                    if (quest.IsAutoAccept() && receiver.CanAddQuest(quest, true) && receiver.CanTakeQuest(quest, true))
+                    {
+                        receiver.AddQuestAndCheckCompletion(quest, sender);
+                        sender.SendPushToPartyResponse(receiver, QuestPushReason.Accepted);
+                        receiver.ClearQuestSharingInfo();
+                    }
                 }
             }
         }