diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index b182284f0..b3a788286 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -10,6 +10,7 @@ Current package versions:
 
 - Add support for new `BITOP` operations in CE 8.2 ([#2900 by atakavci](https://github.com/StackExchange/StackExchange.Redis/pull/2900))
 - Package updates ([#2906 by mgravell](https://github.com/StackExchange/StackExchange.Redis/pull/2906))
+- Fix handshake error with `CLIENT ID` ([#2909 by mgravell](https://github.com/StackExchange/StackExchange.Redis/pull/2909))
 
 ## 2.8.41
 
diff --git a/src/StackExchange.Redis/ResultProcessor.cs b/src/StackExchange.Redis/ResultProcessor.cs
index 03e0a8577..06647212b 100644
--- a/src/StackExchange.Redis/ResultProcessor.cs
+++ b/src/StackExchange.Redis/ResultProcessor.cs
@@ -831,6 +831,9 @@ protected override bool SetResultCore(PhysicalConnection connection, Message mes
                             {
                                 connection.ConnectionId = clientId;
                                 Log?.LogInformation($"{Format.ToString(server)}: Auto-configured (CLIENT) connection-id: {clientId}");
+
+                                SetResult(message, true);
+                                return true;
                             }
                         }
                         break;
diff --git a/tests/StackExchange.Redis.Tests/ConfigTests.cs b/tests/StackExchange.Redis.Tests/ConfigTests.cs
index c8a5eacd6..7c8e917b7 100644
--- a/tests/StackExchange.Redis.Tests/ConfigTests.cs
+++ b/tests/StackExchange.Redis.Tests/ConfigTests.cs
@@ -472,6 +472,7 @@ public void GetClients()
         if (server.Features.ClientId)
         {
             var id = conn.GetConnectionId(server.EndPoint, ConnectionType.Interactive);
+            Log("client id: " + id);
             Assert.NotNull(id);
             Assert.True(clients.Any(x => x.Id == id), "expected: " + id);
             id = conn.GetConnectionId(server.EndPoint, ConnectionType.Subscription);