diff --git a/irc/handlers.go b/irc/handlers.go
index 19ee445c..bd15175d 100644
--- a/irc/handlers.go
+++ b/irc/handlers.go
@@ -543,7 +543,7 @@ func chathistoryHandler(server *Server, client *Client, msg ircmsg.Message, rb *
 		if err == utils.ErrInvalidParams {
 			rb.Add(nil, server.name, "FAIL", "CHATHISTORY", "INVALID_PARAMS", msg.Params[0], client.t("Invalid parameters"))
 		} else if !listTargets && sequence == nil {
-			rb.Add(nil, server.name, "FAIL", "CHATHISTORY", "INVALID_TARGET", utils.SafeErrorParam(target), client.t("Messages could not be retrieved"))
+			rb.Add(nil, server.name, "FAIL", "CHATHISTORY", "INVALID_TARGET", msg.Params[0], utils.SafeErrorParam(target), client.t("Messages could not be retrieved"))
 		} else if err != nil {
 			rb.Add(nil, server.name, "FAIL", "CHATHISTORY", "MESSAGE_ERROR", msg.Params[0], client.t("Messages could not be retrieved"))
 		} else {
diff --git a/irctest b/irctest
index cd58d146..c0a4532f 160000
--- a/irctest
+++ b/irctest
@@ -1 +1 @@
-Subproject commit cd58d14608e4b800aabaa5af395b2a02a71e1e1f
+Subproject commit c0a4532f35a3d299c6b59d3fd6c0ef15a03b44a7