diff --git a/src/engine/shared/snapshot.cpp b/src/engine/shared/snapshot.cpp
index 21eee1616..23124e3f0 100644
--- a/src/engine/shared/snapshot.cpp
+++ b/src/engine/shared/snapshot.cpp
@@ -620,14 +620,16 @@ void *CSnapshotBuilder::NewItem(int Type, int ID, int Size)
 		return 0;
 	}
 
+	bool Extended = false;
 	if(Type >= OFFSET_UUID)
 	{
+		Extended = true;
 		Type = GetTypeFromIndex(GetExtendedItemTypeIndex(Type));
 	}
 
 	CSnapshotItem *pObj = (CSnapshotItem *)(m_aData + m_DataSize);
 
-	if(m_Sixup)
+	if(m_Sixup && !Extended)
 	{
 		if(Type >= 0)
 			Type = Obj_SixToSeven(Type);