diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 8d5da11cda..be2054067b 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -1319,7 +1319,7 @@ class BBCode extends BaseObject
 
 		// Handle Diaspora posts
 		$text = preg_replace_callback(
-			"&\[url=/posts/([^\[\]]*)\](.*)\[\/url\]&Usi",
+			"&\[url=/?posts/([^\[\]]*)\](.*)\[\/url\]&Usi",
 			function ($match) {
 				return "[url=" . System::baseUrl() . "/display/" . $match[1] . "]" . $match[2] . "[/url]";
 			}, $text
diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 0c3a52b2d3..5792d56b6e 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -1200,7 +1200,7 @@ class Diaspora
 		);
 
 		preg_replace_callback(
-			"&\[url=/posts/([^\[\]]*)\](.*)\[\/url\]&Usi",
+			"&\[url=/?posts/([^\[\]]*)\](.*)\[\/url\]&Usi",
 			function ($match) use ($item) {
 				self::fetchGuidSub($match, $item);
 			},