diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 3e70a5cbde..d53126f6ff 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -1076,6 +1076,11 @@ class Contact extends BaseObject
 
 		if (empty($data)) {
 			$data = Probe::uri($url, "", $uid);
+
+			// Ensure that there is a gserver entry
+			if (!empty($data['baseurl']) && ($data['network'] != Protocol::PHANTOM)) {
+				PortableContact::checkServer($data['baseurl']);
+			}
 		}
 
 		// Last try in gcontact for unsupported networks