diff --git a/src/Module/Objects.php b/src/Module/Objects.php
index 3aa8c9e217..558b274919 100644
--- a/src/Module/Objects.php
+++ b/src/Module/Objects.php
@@ -31,13 +31,14 @@ class Objects extends BaseModule
 		/// @todo Add Authentication to enable fetching of non public content
 		// $requester = HTTPSignature::getSigner('', $_SERVER);
 
-		$item = Item::selectFirst(['id', 'author-link'], ['guid' => $a->argv[1], 'private' => false]);
+		// At first we try the original post with that guid
+		$item = Item::selectFirst(['id'], ['guid' => $a->argv[1], 'origin' => true, 'private' => false]);
 		if (!DBA::isResult($item)) {
-			System::httpExit(404);
-		}
-
-		if (!strstr($item['author-link'], System::baseUrl())) {
-			System::httpExit(404);
+			// If no original post could be found, it could possibly be a forum post, there we remove the "origin" field.
+			$item = Item::selectFirst(['id', 'author-link'], ['guid' => $a->argv[1], 'private' => false]);
+			if (!DBA::isResult($item) || !strstr($item['author-link'], System::baseUrl())) {
+				System::httpExit(404);
+			}
 		}
 
 		$data = ActivityPub\Transmitter::createObjectFromItemID($item['id']);