diff --git a/client/client.go b/client/client.go
index 9d8f551f..f72f1745 100644
--- a/client/client.go
+++ b/client/client.go
@@ -210,6 +210,11 @@ func (c *Client) run() {
 		}
 	}
 
+	if c.path != nil {
+		c.path.OnClientRemove(c)
+		c.path = nil
+	}
+
 	if onConnectCmd != nil {
 		onConnectCmd.Close()
 	}
@@ -901,9 +906,6 @@ func (c *Client) runWaitingDescribe() bool {
 			}
 		}()
 
-		c.path.OnClientRemove(c)
-		c.path = nil
-
 		c.conn.Close()
 		return false
 	}
@@ -939,9 +941,6 @@ func (c *Client) runPlay() bool {
 		onReadCmd.Close()
 	}
 
-	c.path.OnClientRemove(c)
-	c.path = nil
-
 	return false
 }
 
@@ -1126,9 +1125,6 @@ func (c *Client) runRecord() bool {
 		}
 	}
 
-	c.path.OnClientRemove(c)
-	c.path = nil
-
 	return false
 }