2 files changed, 4 insertions, 3 deletions
diff --git a/actioncable/lib/action_cable/connection/stream.rb b/actioncable/lib/action_cable/connection/stream.rb
index 0cf59091bc..c250cf92fc 100644
--- a/actioncable/lib/action_cable/connection/stream.rb
+++ b/actioncable/lib/action_cable/connection/stream.rb
@@ -50,6 +50,7 @@ module ActionCable
         def clean_rack_hijack
           return unless @rack_hijack_io
           @event_loop.detach(@rack_hijack_io, self)
+          @rack_hijack_io.close
           @rack_hijack_io = nil
         end
     end
diff --git a/actioncable/lib/action_cable/connection/subscriptions.rb b/actioncable/lib/action_cable/connection/subscriptions.rb
index 3742f248d1..6051818bfb 100644
--- a/actioncable/lib/action_cable/connection/subscriptions.rb
+++ b/actioncable/lib/action_cable/connection/subscriptions.rb
@@ -26,12 +26,12 @@ module ActionCable
         id_key = data['identifier']
         id_options = ActiveSupport::JSON.decode(id_key).with_indifferent_access
 
-        subscription_klass = connection.server.channel_classes[id_options[:channel]]
+        subscription_klass = id_options[:channel].safe_constantize
 
-        if subscription_klass
+        if subscription_klass && ActionCable::Channel::Base >= subscription_klass
           subscriptions[id_key] ||= subscription_klass.new(connection, id_key, id_options)
         else
-          logger.error "Subscription class not found (#{data.inspect})"
+          logger.error "Subscription class not found: #{id_options[:channel].inspect}"
         end
       end