diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 22f168d8f6..c8f8998ae6 100644
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -105,7 +105,7 @@ class APContact extends BaseObject
 
 		$apcontact = [];
 		$apcontact['url'] = $data['id'];
-		$apcontact['uuid'] = defaults($data, 'uuid', null);
+		$apcontact['uuid'] = defaults($data, 'diaspora:guid', null);
 		$apcontact['type'] = defaults($data, 'type', null);
 		$apcontact['following'] = defaults($data, 'following', null);
 		$apcontact['followers'] = defaults($data, 'followers', null);
diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index 539a7302b7..aa387d9a17 100644
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -739,7 +739,7 @@ class ActivityPub
 		$profile = ['network' => Protocol::ACTIVITYPUB];
 		$profile['nick'] = $apcontact['nick'];
 		$profile['name'] = $apcontact['name'];
-		$profile['guid'] = $apcontact['diaspora:guid'];
+		$profile['guid'] = $apcontact['uuid'];
 		$profile['url'] = $apcontact['url'];
 		$profile['addr'] = $apcontact['addr'];
 		$profile['alias'] = $apcontact['alias'];