diff --git a/dGame/dComponents/PropertyManagementComponent.cpp b/dGame/dComponents/PropertyManagementComponent.cpp
index f2f6e0eb..a5e33667 100644
--- a/dGame/dComponents/PropertyManagementComponent.cpp
+++ b/dGame/dComponents/PropertyManagementComponent.cpp
@@ -199,12 +199,16 @@ void PropertyManagementComponent::Claim(const LWOOBJID playerId)
 
 	const auto& worldId = zone->GetZoneID();
 	const auto zoneId = worldId.GetMapID();
-	const auto cloneId = worldId.GetCloneID();
 
 	auto* entity = EntityManager::Instance()->GetEntity(playerId);
 
 	auto* user = entity->GetParentUser();
 
+	auto character = entity->GetCharacter();
+	if (!character) return;
+
+	const auto cloneId = character->GetPropertyCloneID();
+
 	propertyId = ObjectIDManager::GenerateRandomObjectID();
 	
 	auto* insertion = Database::CreatePreppedStmt(