diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index eccd6b7b3453813638512bb7063595d5040e2499..05e22c54b7acd87ef5aeba76e49350c0c7a3bb51 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -1858,12 +1858,17 @@ void LLPipeline::removeMutedAVsLights(LLVOAvatar* muted_avatar)
 {
 	LL_RECORD_BLOCK_TIME(FTM_REMOVE_FROM_LIGHT_SET);
 	for (light_set_t::iterator iter = gPipeline.mNearbyLights.begin();
-		 iter != gPipeline.mNearbyLights.end(); iter++)
+		 iter != gPipeline.mNearbyLights.end();)
 	{
 		if (iter->drawable->getVObj()->isAttachment() && iter->drawable->getVObj()->getAvatar() == muted_avatar)
 		{
+			auto cur_iter = iter++;
 			gPipeline.mLights.erase(iter->drawable);
-			gPipeline.mNearbyLights.erase(iter);
+			gPipeline.mNearbyLights.erase(cur_iter);
+		}
+		else
+		{
+			++iter;
 		}
 	}
 }