diff --git a/app/controllers/api/v1/webhooks/social_inbox_controller.rb b/app/controllers/api/v1/webhooks/social_inbox_controller.rb
index 548781fa..c40857e0 100644
--- a/app/controllers/api/v1/webhooks/social_inbox_controller.rb
+++ b/app/controllers/api/v1/webhooks/social_inbox_controller.rb
@@ -53,7 +53,8 @@ module Api
             instance.present?
             object.present?
             activity.present?
-            activity_pub.approve! if activity_pub.may_approve?
+            activity_pub.update(aasm_state: 'approved')
+            activity.update_activity_pub_state!
           end
 
           head :accepted
@@ -69,7 +70,7 @@ module Api
             instance.present?
             object.present?
             activity.present?
-            activity_pub.reject! if activity_pub.may_reject?
+            activity_pub.update(aasm_state: 'rejected')
           end
 
           head :accepted
diff --git a/app/models/activity_pub.rb b/app/models/activity_pub.rb
index 3887d512..33cd4d45 100644
--- a/app/models/activity_pub.rb
+++ b/app/models/activity_pub.rb
@@ -18,7 +18,7 @@ class ActivityPub < ApplicationRecord
   belongs_to :site
   belongs_to :object, polymorphic: true
   belongs_to :actor
-  belongs_to :remote_flag, class_name: 'ActivityPub::RemoteFlag'
+  belongs_to :remote_flag, optional: true, class_name: 'ActivityPub::RemoteFlag'
   has_many :activities
 
   validates :site_id, presence: true