diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 7b3b843a15..b6c6158871 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -3571,8 +3571,12 @@ class Diaspora
 				$ret["root_guid"] = $guid;
 				return $ret;
 			}
+		} elseif (($guid == "") && $complete) {
+			return false;
 		}
 
+		$ret["root_guid"] = $guid;
+
 		$profile = "";
 		preg_match("/profile='(.*?)'/ism", $attributes, $matches);
 		if ($matches[1] != "") {
@@ -3593,10 +3597,6 @@ class Diaspora
 			}
 		}
 
-		if (!empty($guid)) {
-			$ret["root_guid"] = $guid;
-		}
-
 		if (empty($ret) && !$complete) {
 			return true;
 		}