1 files changed, 5 insertions, 3 deletions
diff --git a/actioncable/lib/action_cable/connection/client_socket.rb b/actioncable/lib/action_cable/connection/client_socket.rb
index 95e1ac4c16..f6b11e93f0 100644
--- a/actioncable/lib/action_cable/connection/client_socket.rb
+++ b/actioncable/lib/action_cable/connection/client_socket.rb
@@ -50,14 +50,16 @@ module ActionCable
         @driver.on(:error)   { |e| emit_error(e.message) }
 
         @stream = ActionCable::Connection::Stream.new(@stream_event_loop, self)
+      end
+
+      def start_driver
+        return if @driver.nil? || @driver_started
+        @stream.hijack_rack_socket
 
         if callback = @env['async.callback']
           callback.call([101, {}, @stream])
         end
-      end
 
-      def start_driver
-        return if @driver.nil? || @driver_started
         @driver_started = true
         @driver.start
       end