diff --git a/app/Util/ActivityPub/Helpers.php b/app/Util/ActivityPub/Helpers.php
index 563cca7fe..a61e1d572 100644
--- a/app/Util/ActivityPub/Helpers.php
+++ b/app/Util/ActivityPub/Helpers.php
@@ -479,8 +479,8 @@ class Helpers {
 				'profile_id' => $pid,
 				'url' => $url,
 				'object_url' => $id,
-				'caption' => strip_tags($activity['content']),
-				'rendered' => Purify::clean($activity['content']),
+				'caption' => isset($activity['content']) ? Purify::clean(strip_tags($activity['content'])) : null,
+				'rendered' => isset($activity['content']) ? Purify::clean($activity['content']) : null,
 				'created_at' => Carbon::parse($ts)->tz('UTC'),
 				'in_reply_to_id' => $reply_to,
 				'local' => false,
diff --git a/app/Util/ActivityPub/Inbox.php b/app/Util/ActivityPub/Inbox.php
index 70dea452a..790a48e8d 100644
--- a/app/Util/ActivityPub/Inbox.php
+++ b/app/Util/ActivityPub/Inbox.php
@@ -698,7 +698,7 @@ class Inbox
 							return;
 						}
 						$status = Status::whereProfileId($profile->id)
-							->whereUri($id)
+							->whereObjectUrl($id)
 							->first();
 						if(!$status) {
 							return;