2 files changed, 5 insertions, 4 deletions

diff --git a/server/helpers/activitypub.ts b/server/helpers/activitypub.ts
index 8b56d2d50..fe721cbac 100644
--- a/server/helpers/activitypub.ts
+++ b/server/helpers/activitypub.ts
@@ -187,10 +187,10 @@ function buildSignedActivity <T> (byActor: MActor, data: T, contextType?: Contex
   return signJsonLDObject(byActor, activity)
 }
 
-function getAPId (activity: string | { id: string }) {
-  if (typeof activity === 'string') return activity
+function getAPId (object: string | { id: string }) {
+  if (typeof object === 'string') return object
 
-  return activity.id
+  return object.id
 }
 
 function checkUrlsSameHost (url1: string, url2: string) {
diff --git a/server/helpers/custom-validators/activitypub/actor.ts b/server/helpers/custom-validators/activitypub/actor.ts
index 675a7b663..a4b152722 100644
--- a/server/helpers/custom-validators/activitypub/actor.ts
+++ b/server/helpers/custom-validators/activitypub/actor.ts
@@ -60,11 +60,12 @@ function isActorDeleteActivityValid (activity: any) {
 }
 
 function sanitizeAndCheckActorObject (actor: any) {
+  if (!isActorTypeValid(actor.type)) return false
+
   normalizeActor(actor)
 
   return exists(actor) &&
     isActivityPubUrlValid(actor.id) &&
-    isActorTypeValid(actor.type) &&
     isActivityPubUrlValid(actor.inbox) &&
     isActorPreferredUsernameValid(actor.preferredUsername) &&
     isActivityPubUrlValid(actor.url) &&