diff --git a/app/models/user.rb b/app/models/user.rb
index cff6927b602..65048da9b94 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -563,7 +563,7 @@ class User < ActiveRecord::Base
 
   def enqueue_staff_welcome_message(role)
     return unless staff?
-    return if role == :admin && User.real.where(admin: true).count == 1
+    return if is_singular_admin?
 
     Jobs.enqueue(
       :send_system_message,
diff --git a/spec/jobs/enable_bootstrap_mode_spec.rb b/spec/jobs/enable_bootstrap_mode_spec.rb
index 6cd2f6e09f9..32c9ca25281 100644
--- a/spec/jobs/enable_bootstrap_mode_spec.rb
+++ b/spec/jobs/enable_bootstrap_mode_spec.rb
@@ -34,6 +34,7 @@ RSpec.describe Jobs::EnableBootstrapMode do
       StaffActionLogger.any_instance.expects(:log_site_setting_change).times(4)
       Jobs::EnableBootstrapMode.new.execute(user_id: admin.id)
       expect(admin.reload.moderator).to be_truthy
+      expect(Jobs::SendSystemMessage.jobs.size).to eq(0)
     end
   end
 end