diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index dedfe0f5798aca9e75b12daf75ef3a43decdd80f..f63b9e048a3cd23d34d6eb0a6a7179662945c6cd 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -9476,18 +9476,16 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
         // we must prevent rolling this one backwards backwards or processing 
         // stale versions.
 
-        S32 aisCOFVersion(LLAppearanceMgr::instance().getCOFVersion());
-
-        LL_DEBUGS("Avatar") << "handling self appearance message #" << thisAppearanceVersion <<
+		LL_DEBUGS("Avatar") << "handling self appearance message #" << thisAppearanceVersion <<
             " (highest seen #" << mLastUpdateReceivedCOFVersion <<
-            ") (AISCOF=#" << aisCOFVersion << ")" << LL_ENDL;
+            ") (AISCOF=#" << LLAppearanceMgr::instance().getCOFVersion() << ")" << LL_ENDL;
 
         if (mFirstTEMessageReceived && (appearance_version == 0))
         {
             return;
         }
 
-        if (mLastUpdateReceivedCOFVersion >= thisAppearanceVersion)
+        if ((appearance_version > 0) && mLastUpdateReceivedCOFVersion >= thisAppearanceVersion)
         {
             LL_WARNS("Avatar") << "Stale appearance received #" << thisAppearanceVersion <<
                 " attempt to roll back from #" << mLastUpdateReceivedCOFVersion <<