diff --git a/src/Factory/Api/Mastodon/Account.php b/src/Factory/Api/Mastodon/Account.php
index a2bd550a73..a459f8d590 100644
--- a/src/Factory/Api/Mastodon/Account.php
+++ b/src/Factory/Api/Mastodon/Account.php
@@ -67,6 +67,10 @@ class Account extends BaseFactory
 			$userContact = [];
 		}
 
+		if (empty($publicContact)) {
+			throw new HTTPException\NotFoundException('Contact ' . $contactId . ' not found');
+		}
+
 		$apcontact = APContact::getByURL($publicContact['url'], false);
 
 		$self_contact = Contact::selectFirst(['uid'], ['nurl' => $publicContact['nurl'], 'self' => true]);