diff --git a/CryptoExchange.Net/Objects/Sockets/StreamMessageParseCallback.cs b/CryptoExchange.Net/Objects/Sockets/StreamMessageParseCallback.cs
index bb4deff..3e0357b 100644
--- a/CryptoExchange.Net/Objects/Sockets/StreamMessageParseCallback.cs
+++ b/CryptoExchange.Net/Objects/Sockets/StreamMessageParseCallback.cs
@@ -14,6 +14,6 @@ namespace CryptoExchange.Net.Objects.Sockets
     {
         public Func<WebSocketMessageType, Stream, Stream>? PreProcessCallback { get; set; }
         public Func<IMessageAccessor, string?> GetStreamIdentifier { get; set; }
-        public Func<IMessageAccessor, string?> GetTypeIdentifier { get; set; }
+        public Func<IMessageAccessor, string, string?> GetTypeIdentifier { get; set; } = (accessor, streamId) => streamId;
     }
 }
diff --git a/CryptoExchange.Net/Sockets/SocketConnection.cs b/CryptoExchange.Net/Sockets/SocketConnection.cs
index 9e18ee5..6242382 100644
--- a/CryptoExchange.Net/Sockets/SocketConnection.cs
+++ b/CryptoExchange.Net/Sockets/SocketConnection.cs
@@ -378,7 +378,7 @@ namespace CryptoExchange.Net.Sockets
             if (streamIdentity == null)
                 return null;
 
-            var typeIdentity = ApiClient.Pipeline.GetTypeIdentifier(accessor);
+            var typeIdentity = ApiClient.Pipeline.GetTypeIdentifier(accessor, streamIdentity);
             var typeResult = _listenerManager.IdToType(streamIdentity, typeIdentity);
             if (typeResult == null)
                 return null;