diff --git a/clients/ts/signalr/src/HubConnection.ts b/clients/ts/signalr/src/HubConnection.ts
index 7750e8d7e1..72c01d31db 100644
--- a/clients/ts/signalr/src/HubConnection.ts
+++ b/clients/ts/signalr/src/HubConnection.ts
@@ -95,7 +95,7 @@ export class HubConnection {
                         this.connection.stop(message.error ? new Error("Server returned an error on close: " + message.error) : null);
                         break;
                     default:
-                        this.logger.log(LogLevel.Warning, "Invalid message type: " + data);
+                        this.logger.log(LogLevel.Warning, "Invalid message type: " + message.type);
                         break;
                 }
             }
diff --git a/clients/ts/signalr/src/Transports.ts b/clients/ts/signalr/src/Transports.ts
index 50f23e30b9..8827d668b9 100644
--- a/clients/ts/signalr/src/Transports.ts
+++ b/clients/ts/signalr/src/Transports.ts
@@ -71,7 +71,7 @@ export class WebSocketTransport implements ITransport {
             };
 
             webSocket.onmessage = (message: MessageEvent) => {
-                this.logger.log(LogLevel.Trace, `(WebSockets transport) data received: ${message.data}`);
+                this.logger.log(LogLevel.Trace, `(WebSockets transport) data received. Length ${getDataLength(message.data)}.`);
                 if (this.onreceive) {
                     this.onreceive(message.data);
                 }
@@ -151,7 +151,7 @@ export class ServerSentEventsTransport implements ITransport {
                 eventSource.onmessage = (e: MessageEvent) => {
                     if (this.onreceive) {
                         try {
-                            this.logger.log(LogLevel.Trace, `(SSE transport) data received: ${e.data}`);
+                            this.logger.log(LogLevel.Trace, `(SSE transport) data received. Length ${getDataLength(e.data)}.`);
                             this.onreceive(e.data);
                         } catch (error) {
                             if (this.onclose) {
@@ -276,7 +276,7 @@ export class LongPollingTransport implements ITransport {
                 } else {
                     // Process the response
                     if (response.content) {
-                        this.logger.log(LogLevel.Trace, `(LongPolling transport) data received: ${response.content}`);
+                        this.logger.log(LogLevel.Trace, `(LongPolling transport) data received. Length ${getDataLength(response.content)}.`);
                         if (this.onreceive) {
                             this.onreceive(response.content);
                         }
@@ -313,6 +313,16 @@ export class LongPollingTransport implements ITransport {
     public onclose: TransportClosed;
 }
 
+function getDataLength(data: any): number {
+    let length: number = null;
+    if (data instanceof ArrayBuffer) {
+        length = data.byteLength;
+    } else if (data instanceof String) {
+        length = data.length;
+    }
+    return length;
+}
+
 async function send(httpClient: HttpClient, url: string, accessTokenFactory: () => string, content: string | ArrayBuffer): Promise<void> {
     let headers;
     const token = accessTokenFactory();