diff --git a/components/cibsync/cibsynccomponent.cpp b/components/cibsync/cibsynccomponent.cpp
index e1727f819..ecd4ebf57 100644
--- a/components/cibsync/cibsynccomponent.cpp
+++ b/components/cibsync/cibsynccomponent.cpp
@@ -215,14 +215,14 @@ void CIBSyncComponent::RemoteObjectUpdateHandler(const Endpoint::Ptr& sender, co
 			return;
 		}
 
+		if (object->GetSource().IsEmpty())
+			object->SetSource(sender->GetIdentity());
+
 		object->Register();
 	} else {
 		if (object->IsLocal())
 			throw_exception(invalid_argument("Replicated remote object is marked as local."));
 
-		if (object->GetSource().IsEmpty())
-			object->SetSource(sender->GetIdentity());
-
 		// TODO: disallow config updates depending on endpoint config
 
 		object->ApplyUpdate(update, Attribute_All);