diff --git a/config/initializers/100-sidekiq.rb b/config/initializers/100-sidekiq.rb
index 515898fb012..a155c113cb3 100644
--- a/config/initializers/100-sidekiq.rb
+++ b/config/initializers/100-sidekiq.rb
@@ -23,7 +23,7 @@ if Sidekiq.server?
   Rails.application.config.after_initialize do
     scheduler_hostname = ENV["UNICORN_SCHEDULER_HOSTNAME"]
 
-    if !scheduler_hostname || scheduler_hostname == `hostname`.strip
+    if !scheduler_hostname || scheduler_hostname.split(',').include?(`hostname`.strip)
       require 'scheduler/scheduler'
       manager = Scheduler::Manager.new
       Scheduler::Manager.discover_schedules.each do |schedule|
diff --git a/lib/demon/sidekiq.rb b/lib/demon/sidekiq.rb
index 350b2da28b7..a6f01944152 100644
--- a/lib/demon/sidekiq.rb
+++ b/lib/demon/sidekiq.rb
@@ -37,7 +37,7 @@ class Demon::Sidekiq < Demon::Base
     [['critical', 4], ['default', 2], ['low', 1]].each do |queue_name, weight|
       custom_queue_hostname = ENV["UNICORN_SIDEKIQ_#{queue_name.upcase}_QUEUE_HOSTNAME"]
 
-      if !custom_queue_hostname || custom_queue_hostname == `hostname`.strip
+      if !custom_queue_hostname || custom_queue_hostname.split(',').include?(`hostname`.strip)
         options << "-q"
         options << "#{queue_name},#{weight}"
       end