diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index b81bf86559..b904c2b6e8 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -14,6 +14,7 @@
 
 #include <cstdio>
 #include <cstring>
+#include <limits>
 #include <stdint.h>
 
 #include <QtCore/QDataStream>
@@ -1478,7 +1479,10 @@ QUrl AvatarData::cannonicalSkeletonModelURL(const QUrl& emptyURL) const {
 }
 
 void AvatarData::processAvatarIdentity(const Identity& identity, bool& identityChanged, bool& displayNameChanged, quint64 messageNumber) {
-    if (messageNumber < _lastIdentityPacketMessageNumber) {
+
+    if (messageNumber < _lastIdentityPacketMessageNumber && 
+            _lastIdentityPacketMessageNumber < std::numeric_limits<quint64>::max()) {
+
         qCDebug(avatars) << "Ignoring late identity packet for avatar " << getSessionUUID() 
                          << "messageNumber:" << messageNumber << "_lastIdentityPacketMessageNumber:" << _lastIdentityPacketMessageNumber;
         return;