diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp
index 2d4894deb..56db8d221 100644
--- a/src/server/game/Handlers/QuestHandler.cpp
+++ b/src/server/game/Handlers/QuestHandler.cpp
@@ -297,10 +297,22 @@ void WorldSession::HandleQuestgiverChooseRewardOpcode(WorldPacket& recvData)
                             // Send next quest
                             if (Quest const* nextQuest = _player->GetNextQuest(guid, quest))
                             {
-                                if (_player->CanAddQuest(nextQuest, false) && _player->CanTakeQuest(nextQuest, false))
+                                if (_player->CanTakeQuest(nextQuest, false))
                                 {
                                     if (nextQuest->IsAutoAccept())
-                                        _player->AddQuestAndCheckCompletion(nextQuest, object);
+                                    {
+                                        // QUEST_FLAGS_AUTO_ACCEPT was not used by Blizzard.
+                                        if (_player->CanAddQuest(nextQuest, false))
+                                        {
+                                            _player->AddQuestAndCheckCompletion(nextQuest, object);
+                                        }
+                                        else
+                                        {
+                                            // Auto accept is set for a custom quest and there is no inventory space
+                                            _player->PlayerTalkClass->SendCloseGossip();
+                                            break;
+                                        }
+                                    }
                                     _player->PlayerTalkClass->SendQuestGiverQuestDetails(nextQuest, guid, true);
                                 }
                             }