diff --git a/lib/jam_websockets/router.rb b/lib/jam_websockets/router.rb
index 03c394aea..cb46871b3 100644
--- a/lib/jam_websockets/router.rb
+++ b/lib/jam_websockets/router.rb
@@ -545,13 +545,13 @@ module JamWebsockets
         return nil
       end
 
-      music_session_client = MusicSessionClient.find_by_client_id(client_id)
+      client_connection = Connection.find_by_client_id(client_id)
 
-      if music_session_client.nil?
+      if client_connection.nil?
         raise PermissionError, 'specified client not found'
       end
 
-      if !music_session_client.access_p2p? user
+      if !client_connection.access_p2p? user
         raise SessionError, 'not allowed to message this client'
       end
     end