diff --git a/src/mcpdotnet/Protocol/Transport/SseClientTransport.cs b/src/mcpdotnet/Protocol/Transport/SseClientTransport.cs
index a508d26..8ccf1a5 100644
--- a/src/mcpdotnet/Protocol/Transport/SseClientTransport.cs
+++ b/src/mcpdotnet/Protocol/Transport/SseClientTransport.cs
@@ -1,4 +1,5 @@
 using System.Net.Http.Headers;
+using System.Net.ServerSentEvents;
 using System.Text;
 using System.Text.Json;
 using McpDotNet.Configuration;
@@ -191,30 +192,21 @@ public sealed class SseClientTransport : TransportBase, IClientTransport
                 response.EnsureSuccessStatusCode();
 
                 using var stream = await response.Content.ReadAsStreamAsync(cancellationToken);
-                using var reader = new StreamReader(stream);
 
                 // Reset reconnect attempts on successful connection
                 reconnectAttempts = 0;
 
-                string? currentEvent = null;
-                string? line;
-                while ((line = await reader.ReadLineAsync(cancellationToken)) != null)
+                await foreach (SseItem<string> sseEvent in SseParser.Create(stream).EnumerateAsync(cancellationToken))
                 {
-                    if (line.StartsWith("event: "))
+                    switch (sseEvent.EventType)
                     {
-                        currentEvent = line.Substring(7);
-                    }
-                    else if (line.StartsWith("data: "))
-                    {
-                        var data = line.Substring(6);
-                        if (currentEvent == "endpoint")
-                        {
-                            HandleEndpointEvent(data);
-                        }
-                        else
-                        {
-                            await ProcessSseMessage(data, cancellationToken);
-                        }
+                        case "endpoint":
+                            HandleEndpointEvent(sseEvent.Data);
+                            break;
+
+                        case "message":
+                            await ProcessSseMessage(sseEvent.Data, cancellationToken);
+                            break;
                     }
                 }
             }
diff --git a/src/mcpdotnet/mcpdotnet.csproj b/src/mcpdotnet/mcpdotnet.csproj
index 99af1e7..26e8189 100644
--- a/src/mcpdotnet/mcpdotnet.csproj
+++ b/src/mcpdotnet/mcpdotnet.csproj
@@ -11,7 +11,7 @@
     <PackageId>mcpdotnet</PackageId>
     <Version>1.0.1.3</Version>
     <Authors>PederHP</Authors>
-    <Description>.NET client library for the Model Context Protocol (MCP)</Description>
+    <Description>.NET library for the Model Context Protocol (MCP)</Description>
     <PackageProjectUrl>https://github.com/PederHP/mcpdotnet</PackageProjectUrl>
     <RepositoryUrl>https://github.com/PederHP/mcpdotnet</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
@@ -32,11 +32,12 @@
 
   <ItemGroup>
     <InternalsVisibleTo Include="McpDotNet.Tests" />
-  </ItemGroup>  
+  </ItemGroup>
   
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
+    <PackageReference Include="System.Net.ServerSentEvents" Version="9.0.0" />
   </ItemGroup>
 
 </Project>