diff --git a/app/models/user_role.rb b/app/models/user_role.rb
index 23cc28b9b7..5dbb26580f 100644
--- a/app/models/user_role.rb
+++ b/app/models/user_role.rb
@@ -142,6 +142,10 @@ class UserRole < ApplicationRecord
     other_role.nil? || position > other_role.position
   end
 
+  def enables_delivery?(role)
+    overrides?(role) && highlighted? && can?(*Flags::CATEGORIES[:moderation])
+  end
+
   def computed_permissions
     # If called on the everyone role, no further computation needed
     return permissions if everyone?
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index 0cf56c5a24..216ff262b3 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -134,7 +134,7 @@ class NotifyService < BaseService
     end
 
     def from_staff?
-      @sender.local? && @sender.user.present? && @sender.user_role&.overrides?(@recipient.user_role) && @sender.user_role&.highlighted? && @sender.user_role&.can?(*UserRole::Flags::CATEGORIES[:moderation])
+      @sender.local? && @sender.user.present? && @sender.user_role&.enables_delivery?(@recipient.user_role)
     end
 
     def from_self?