diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb
index 55123f68a3..45ce7252f4 100644
--- a/app/lib/activitypub/activity.rb
+++ b/app/lib/activitypub/activity.rb
@@ -119,10 +119,7 @@ class ActivityPub::Activity
 
     dereferencer = ActivityPub::Dereferencer.new(@object, permitted_origin: @account.uri, signature_actor: signed_fetch_actor)
 
-    return if dereferencer.object.nil?
-
-    @object = dereferencer.object
-    @json = @object
+    @object = dereferencer.object unless dereferencer.object.nil?
   end
 
   def signed_fetch_actor
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 833597d240..20496eb8c9 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -118,7 +118,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   end
 
   def process_status_params
-    @status_parser = ActivityPub::Parser::StatusParser.new(@json, followers_collection: @account.followers_url)
+    @status_parser = ActivityPub::Parser::StatusParser.new(@json['signature'].present? ? @object : @json, followers_collection: @account.followers_url)
 
     @params = {
       uri: @status_parser.uri,