diff --git a/libraries/avatars/src/AvatarHashMap.cpp b/libraries/avatars/src/AvatarHashMap.cpp
index 0c5ca06989..f0669fbd30 100644
--- a/libraries/avatars/src/AvatarHashMap.cpp
+++ b/libraries/avatars/src/AvatarHashMap.cpp
@@ -436,9 +436,9 @@ void AvatarHashMap::sessionUUIDChanged(const QUuid& sessionUUID, const QUuid& ol
 void AvatarHashMap::clearOtherAvatars() {
     QWriteLocker locker(&_hashLock);
 
-    AvatarHash::iterator avatarIterator =  _avatarHash.begin();
-    while (avatarIterator != _avatarHash.end()) {
-        handleRemovedAvatar(*avatarIterator);
-        avatarIterator = _avatarHash.erase(avatarIterator);
+    for (auto& av : _avatarHash) {
+        handleRemovedAvatar(av);
     }
+
+    _avatarHash.clear();
 }