diff --git a/data/sql/updates/pending_db_world/rev_1582041321256109939.sql b/data/sql/updates/pending_db_world/rev_1582041321256109939.sql
new file mode 100644
index 000000000..428c7e727
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1582041321256109939.sql
@@ -0,0 +1,3 @@
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1582041321256109939');
+
+UPDATE `gameobject_template_addon` SET `flags` = `flags` | 4 WHERE `entry` IN (SELECT `entry` FROM `gameobject_template` WHERE `type` = 2 AND `data3` = 0);
diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp
index e76541525..4fb679840 100644
--- a/src/server/game/Handlers/QuestHandler.cpp
+++ b/src/server/game/Handlers/QuestHandler.cpp
@@ -316,7 +316,7 @@ void WorldSession::HandleQuestgiverChooseRewardOpcode(WorldPacket & recvData)
                         // Send next quest
                         if (Quest const* nextQuest = _player->GetNextQuest(guid, quest))
                         {
-                            if (_player->CanAddQuest(nextQuest, false) && _player->CanTakeQuest(quest, false))
+                            if (_player->CanAddQuest(nextQuest, false) && _player->CanTakeQuest(nextQuest, false))
                             {
                                 if (nextQuest->IsAutoAccept())
                                     _player->AddQuestAndCheckCompletion(nextQuest, object);