diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp
index 1d6758273..d5820df38 100644
--- a/indra/newview/llfloateravatarlist.cpp
+++ b/indra/newview/llfloateravatarlist.cpp
@@ -617,15 +617,7 @@ void LLFloaterAvatarList::expireAvatarList()
 		else
 		{
 			entry->setPosition(entry->getPosition(), false, false, false, false); // Dead and gone
-			if(mAvatars.back() == *it)
-			{
-				mAvatars.pop_back();
-				return;
-			}
-			*it = mAvatars.back();
-			mAvatars.pop_back();
-			if(mAvatars.empty())
-				return;
+			mAvatars.erase(it);
 		}
 	}
 }