2 files changed, 28 insertions, 2 deletions
diff --git a/actioncable/lib/action_cable/subscription_adapter/evented_redis.rb b/actioncable/lib/action_cable/subscription_adapter/evented_redis.rb
index bcd46d2a0e..c3018c5281 100644
--- a/actioncable/lib/action_cable/subscription_adapter/evented_redis.rb
+++ b/actioncable/lib/action_cable/subscription_adapter/evented_redis.rb
@@ -68,10 +68,10 @@ module ActionCable
         end
 
         def ensure_reactor_running
-          return if EventMachine.reactor_running?
+          return if EventMachine.reactor_running? && EventMachine.reactor_thread
           @@mutex.synchronize do
             Thread.new { EventMachine.run } unless EventMachine.reactor_running?
-            Thread.pass until EventMachine.reactor_running?
+            Thread.pass until EventMachine.reactor_running? && EventMachine.reactor_thread
           end
         end
     end
diff --git a/actioncable/test/subscription_adapter/evented_redis_test.rb b/actioncable/test/subscription_adapter/evented_redis_test.rb
index f316bc46ef..2401950aa7 100644
--- a/actioncable/test/subscription_adapter/evented_redis_test.rb
+++ b/actioncable/test/subscription_adapter/evented_redis_test.rb
@@ -23,6 +23,32 @@ class EventedRedisAdapterTest < ActionCable::TestCase
     $VERBOSE = @previous_verbose
   end
 
+  def test_slow_eventmachine
+    require "eventmachine"
+    require "thread"
+
+    lock = Mutex.new
+
+    EventMachine.singleton_class.class_eval do
+      alias_method :delayed_initialize_event_machine, :initialize_event_machine
+      define_method(:initialize_event_machine) do
+        lock.synchronize do
+          sleep 0.5
+          delayed_initialize_event_machine
+        end
+      end
+    end
+
+    test_basic_broadcast
+  ensure
+    lock.synchronize do
+      EventMachine.singleton_class.class_eval do
+        alias_method :initialize_event_machine, :delayed_initialize_event_machine
+        remove_method :delayed_initialize_event_machine
+      end
+    end
+  end
+
   def cable_config
     { adapter: "evented_redis", url: "redis://127.0.0.1:6379/12" }
   end