diff --git a/.rubocop.yml b/.rubocop.yml
index f757416..cdb7c47 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -84,11 +84,6 @@ Style/ConditionalAssignment:
 Style/EmptyMethod:
   EnforcedStyle: expanded
 
-# We do not wish to auto correct unused method arguments because that can be a
-# pain.  These should just be flagged for manual intervention.
-Lint/UnusedMethodArgument:
-  AutoCorrect: false
-
 # As above, just flag them.
 Lint/UnusedBlockArgument:
   AutoCorrect: false
@@ -179,3 +174,6 @@ Metrics/BlockLength:
 
 Metrics/ClassLength:
   Enabled: false
+
+Lint/UnusedMethodArgument:
+  Enabled: false
diff --git a/api/structures/message_api_structure.rb b/api/structures/message_api_structure.rb
index a48512a..6cc3dcd 100644
--- a/api/structures/message_api_structure.rb
+++ b/api/structures/message_api_structure.rb
@@ -7,9 +7,9 @@ structure :message do
   expansion(:status) do
     {
       status: o.status,
-      last_delivery_attempt: o.last_delivery_attempt ? o.last_delivery_attempt.to_f : nil,
+      last_delivery_attempt: o.last_delivery_attempt&.to_f,
       held: o.held,
-      hold_expiry: o.hold_expiry ? o.hold_expiry.to_f : nil
+      hold_expiry: o.hold_expiry&.to_f
     }
   end
 
diff --git a/app/jobs/send_webhook_job.rb b/app/jobs/send_webhook_job.rb
index cf37d4f..7c6dcb6 100644
--- a/app/jobs/send_webhook_job.rb
+++ b/app/jobs/send_webhook_job.rb
@@ -5,14 +5,12 @@ class SendWebhookJob < Postal::Job
   def perform
     if server = Server.find(params["server_id"])
       new_items = {}
-      if params["payload"]
-        params["payload"].each do |key, value|
-          next unless key.to_s =~ /\A_(\w+)/
+      params["payload"]&.each do |key, value|
+        next unless key.to_s =~ /\A_(\w+)/
 
-          begin
-            new_items[::Regexp.last_match(1)] = server.message_db.message(value.to_i).webhook_hash
-          rescue Postal::MessageDB::Message::NotFound
-          end
+        begin
+          new_items[::Regexp.last_match(1)] = server.message_db.message(value.to_i).webhook_hash
+        rescue Postal::MessageDB::Message::NotFound
         end
       end
 
diff --git a/app/jobs/unqueue_message_job.rb b/app/jobs/unqueue_message_job.rb
index d2d8619..2fb94e9 100644
--- a/app/jobs/unqueue_message_job.rb
+++ b/app/jobs/unqueue_message_job.rb
@@ -430,13 +430,11 @@ class UnqueueMessageJob < Postal::Job
             if defined?(Sentry)
               Sentry.capture_exception(e, extra: { job_id: self.id, server_id: queued_message.server_id, message_id: queued_message.message_id })
             end
-            if queued_message.message
-              queued_message.message.create_delivery("Error",
-                                                     details: "An internal error occurred while sending " \
-                                                              "this message. This message will be retried " \
-                                                              "automatically.",
-                                                     output: "#{e.class}: #{e.message}", log_id: "J-#{self.id}")
-            end
+            queued_message.message&.create_delivery("Error",
+                                                    details: "An internal error occurred while sending " \
+                                                             "this message. This message will be retried " \
+                                                             "automatically.",
+                                                    output: "#{e.class}: #{e.message}", log_id: "J-#{self.id}")
           end
         end
 
diff --git a/lib/postal/message_db/message.rb b/lib/postal/message_db/message.rb
index df778d0..580b315 100644
--- a/lib/postal/message_db/message.rb
+++ b/lib/postal/message_db/message.rb
@@ -335,7 +335,7 @@ module Postal
       # Return the recipient domain for this message
       #
       def recipient_domain
-        rcpt_to ? rcpt_to.split("@").last : nil
+        rcpt_to&.split("@")&.last
       end
 
       #
diff --git a/lib/postal/smtp_server/client.rb b/lib/postal/smtp_server/client.rb
index 4c33919..c4c2c3a 100644
--- a/lib/postal/smtp_server/client.rb
+++ b/lib/postal/smtp_server/client.rb
@@ -380,7 +380,7 @@ module Postal
           else
             idata = idata.to_s.sub(/\A\.\./, ".")
 
-            if @credential && @credential.server.log_smtp_data?
+            if @credential&.server&.log_smtp_data?
               # We want to log if enabled
             else
               log "Not logging further message data."