diff --git a/app/models/activity_pub/activity/delete.rb b/app/models/activity_pub/activity/delete.rb
index f6ff6536..5de20478 100644
--- a/app/models/activity_pub/activity/delete.rb
+++ b/app/models/activity_pub/activity/delete.rb
@@ -14,9 +14,15 @@ class ActivityPub
       # @see {https://docs.joinmastodon.org/spec/security/#ld}
       def update_activity_pub_state!
         ActivityPub.transaction do
-          ActivityPub::Object.find_by(uri: ActivityPub.uri_from_object(content['object']))&.activity_pubs&.find_each(&:remove!)
+          object = ActivityPub::Object.find_by(uri: ActivityPub.uri_from_object(content['object']))
 
-          activity_pub.remove!
+          if object
+            object.activity_pubs.find_each do |activity_pub|
+              activity_pub.remove! if activity_pub.may_remove?
+            end
+          end
+
+          activity_pub.remove! if activity_pub.may_remove?
         end
       end
     end
diff --git a/app/views/moderation_queue/_comments.haml b/app/views/moderation_queue/_comments.haml
index 436777db..316b097f 100644
--- a/app/views/moderation_queue/_comments.haml
+++ b/app/views/moderation_queue/_comments.haml
@@ -14,4 +14,4 @@
     - moderation_queue.each do |activity_pub|
       -# cache [activity_pub, activity_pub.object, activity_pub.actor] do
       %hr
-      = render 'comment', comment: activity_pub.object.content, profile: activity_pub.actor.content, activity_pub: activity_pub, form_id: form_id
+      = render 'moderation_queue/comment', comment: activity_pub.object.content, profile: activity_pub.actor.content, activity_pub: activity_pub, form_id: form_id