diff --git a/CvGameCoreDLL_Expansion2/CvMinorCivAI.cpp b/CvGameCoreDLL_Expansion2/CvMinorCivAI.cpp
index baac247668..a49d0cc6fe 100644
--- a/CvGameCoreDLL_Expansion2/CvMinorCivAI.cpp
+++ b/CvGameCoreDLL_Expansion2/CvMinorCivAI.cpp
@@ -6424,13 +6424,7 @@ void CvMinorCivAI::DoQuestsCleanupForPlayer(PlayerTypes ePlayer)
 				bGlobalQuestDone = true;
 
 			// Store the next iterator before erasing the current element
-			QuestListForPlayer::iterator next_itr = itr_quest;
-			++next_itr;
-
-			m_QuestsGiven[ePlayer].erase(itr_quest);
-
-			// Move to the next valid iterator
-			itr_quest = next_itr;
+			itr_quest = m_QuestsGiven[ePlayer].erase(itr_quest);
 		}
 		else
 		{