diff --git a/irc/client.go b/irc/client.go
index 2d5a9e81..017dfac0 100644
--- a/irc/client.go
+++ b/irc/client.go
@@ -103,9 +103,16 @@ func (client *Client) Destroy() error {
 	if client.replies == nil {
 		return ErrAlreadyDestroyed
 	}
+
 	close(client.replies)
 	client.replies = nil
 	client.conn.Close()
+	if client.idleTimer != nil {
+		client.idleTimer.Stop()
+	}
+	if client.quitTimer != nil {
+		client.quitTimer.Stop()
+	}
 	return nil
 }