diff --git a/libraries/avatars/src/AvatarHashMap.cpp b/libraries/avatars/src/AvatarHashMap.cpp
index ffb945df4c..8871769261 100644
--- a/libraries/avatars/src/AvatarHashMap.cpp
+++ b/libraries/avatars/src/AvatarHashMap.cpp
@@ -134,11 +134,16 @@ void AvatarHashMap::processAvatarIdentityPacket(QSharedPointer<ReceivedMessage>
     // make sure this isn't for an ignored avatar
     auto nodeList = DependencyManager::get<NodeList>();
     static auto EMPTY = QUuid();
-    if (identity.uuid == _avatarHash.value(EMPTY)->getSessionUUID()) {
-        // We add MyAvatar to _avatarHash with an empty UUID. Code relies on this. In order to correctly handle an
-        // identity packet for ourself (such as when we are assigned a sessionDisplayName by the mixer upon joining),
-        // we make things match here.
-        identity.uuid = EMPTY;
+
+    {
+        QReadLocker locker(&_hashLock);
+        auto me = _avatarHash.find(EMPTY);
+        if ((me != _avatarHash.end()) && (identity.uuid == me.value()->getSessionUUID())) {
+            // We add MyAvatar to _avatarHash with an empty UUID. Code relies on this. In order to correctly handle an
+            // identity packet for ourself (such as when we are assigned a sessionDisplayName by the mixer upon joining),
+            // we make things match here.
+            identity.uuid = EMPTY;
+        }
     }
     if (!nodeList->isIgnoringNode(identity.uuid)) {
         // mesh URL for a UUID, find avatar in our list