1 files changed, 2 insertions, 2 deletions
diff --git a/lib/action_cable/server/connections.rb b/lib/action_cable/server/connections.rb
index 4a5e21f5fd..b3d1632cf7 100644
--- a/lib/action_cable/server/connections.rb
+++ b/lib/action_cable/server/connections.rb
@@ -22,8 +22,8 @@ module ActionCable
       # then can't rely on being able to receive and send to it. So there's a 3 second heartbeat running on all connections. If the beat fails, we automatically
       # disconnect.
       def setup_heartbeat_timer
-        @heartbeat_timer ||= EM.next_tick do
-          EventMachine.add_periodic_timer(BEAT_INTERVAL) do
+        EM.next_tick do
+          @heartbeat_timer ||= EventMachine.add_periodic_timer(BEAT_INTERVAL) do
             EM.next_tick { connections.map &:beat }
           end
         end