diff --git a/src/Content/Item.php b/src/Content/Item.php
index 7a86135f9..1b07c5585 100644
--- a/src/Content/Item.php
+++ b/src/Content/Item.php
@@ -672,11 +672,8 @@ class Item
 
 		// If it is a reshared post then reformat it to avoid display problems with two share elements
 		if (Diaspora::isReshare($item['body'], false)) {
-			if (!empty($shared['guid'])) {
-				$encaspulated_share = self::createSharedPostByGuid($shared['guid']);
-				if (!empty($encaspulated_share)) {
-					$item['body'] = preg_replace("/\[share.*?\](.*)\[\/share\]/ism", $encaspulated_share, $item['body']);
-				}
+			if (!empty($shared['guid']) && ($encaspulated_share = self::createSharedPostByGuid($shared['guid']))) {
+				$item['body'] = preg_replace("/\[share.*?\](.*)\[\/share\]/ism", $encaspulated_share, $item['body']);
 			}
 	
 			$item['body'] = HTML::toBBCode(BBCode::convertForUriId($item['uri-id'], $item['body'], BBCode::ACTIVITYPUB));