diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 654829d7..f845b671 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,7 +43,8 @@ jobs:
         run: go test -v -race -tags integration -coverprofile=coverage.out $(go list ./... | grep -v /_examples/)
 
       - name: Upload code coverage to codecov
-        if: matrix.go-version == '1.22'
+        if: matrix.go-version == '1.22' && matrix.redis-version == 7
         uses: codecov/codecov-action@v4
         with:
           file: ./coverage.out
+          token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/client.go b/client.go
index 81abde44..e920fe90 100644
--- a/client.go
+++ b/client.go
@@ -2944,10 +2944,7 @@ func (c *Client) subscribeCmd(req *protocol.SubscribeRequest, reply SubscribeRep
 		protoReply, err := c.getSubscribeCommandReply(res)
 		if err != nil {
 			c.node.logger.log(newLogEntry(LogLevelError, "error encoding subscribe", map[string]any{"error": err.Error()}))
-			if !serverSide {
-				// Will be called later in case of server side sub.
-				c.pubSubSync.StopBuffering(channel)
-			}
+			c.pubSubSync.StopBuffering(channel) // Will be called later in case of server side sub.
 			ctx.disconnect = &DisconnectServerError
 			return ctx
 		}