diff --git a/client.go b/client.go
index e4226626..eb7c1de4 100644
--- a/client.go
+++ b/client.go
@@ -583,7 +583,8 @@ func (c *Client) runInner() error {
 			c.reader = nil
 			return err
 
-		case <-c.chReadResponse:
+		case res := <-c.chReadResponse:
+			c.OnResponse(res)
 			return liberrors.ErrClientUnexpectedResponse{}
 
 		case req := <-c.chReadRequest:
@@ -612,6 +613,7 @@ func (c *Client) waitResponse() (*base.Response, error) {
 			return nil, err
 
 		case res := <-c.chReadResponse:
+			c.OnResponse(res)
 			return res, nil
 
 		case req := <-c.chReadRequest:
@@ -916,8 +918,6 @@ func (c *Client) do(req *base.Request, skipResponse bool) (*base.Response, error
 		return nil, err
 	}
 
-	c.OnResponse(res)
-
 	// get session from response
 	if v, ok := res.Header["Session"]; ok {
 		var sx headers.Session