diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index afd5bc92b..534e1ce8a 100644
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -38,7 +38,6 @@ class OnePoll
 			return;
 		}
 
-		Contact::updateFromProbe($contact_id, '', $force);
 
 		$contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
 		if (!DBA::isResult($contact)) {
@@ -46,6 +45,10 @@ class OnePoll
 			return;
 		}
 
+		if (($contact['network'] != Protocol::MAIL) || $force) {
+			Contact::updateFromProbe($contact_id, '', $force);
+		}
+
 		// Special treatment for wrongly detected local contacts
 		if (!$force && ($contact['network'] != Protocol::DFRN) && Contact::isLocalById($contact_id)) {
 			Contact::updateFromProbe($contact_id, Protocol::DFRN, true);