diff --git a/app/jobs/activity_pub/fetch_job.rb b/app/jobs/activity_pub/fetch_job.rb
index 54641dbf..0a3ebf03 100644
--- a/app/jobs/activity_pub/fetch_job.rb
+++ b/app/jobs/activity_pub/fetch_job.rb
@@ -19,25 +19,16 @@ class ActivityPub
     #
     # @param error [Exception]
     # @return [Bool]
-    def handle_error(error)
-      case error
-      when FastJsonparser::ParseError
-        expire
-
-        ExceptionNotifier.notify_exception(error, data: { site: site.name, object: object.uri, body: response.body })
-
-        false
-      when ActiveRecord::RecordInvalid, SocketError, SystemCallError, Net::OpenTimeout, OpenSSL::OpenSSLError
-        retry_in(ApplicationJob.random_wait)
-
-        false
-      else
-        expire
-
-        true
-      end
+    discard_on(FastJsonparser::ParseError) do |error|
+      ExceptionNotifier.notify_exception(error, data: { site: site.name, object: object.uri, body: response.body })
     end
 
+    retry_on ActiveRecord::RecordInvalid
+    retry_on SocketError, wait: ApplicationJob.random_wait
+    retry_on SystemCallError, wait: ApplicationJob.random_wait
+    retry_on Net::OpenTimeout, wait: ApplicationJob.random_wait
+    retry_on OpenSSL::OpenSSLError, wait: ApplicationJob.random_wait
+
     def perform(site:, object_id:)
       ActivityPub::Object.transaction do
         @site = site