diff --git a/irc/channel.go b/irc/channel.go
index 61b5a159..7836f79f 100644
--- a/irc/channel.go
+++ b/irc/channel.go
@@ -1059,7 +1059,7 @@ func (channel *Channel) replayHistoryItems(rb *ResponseBuffer, items []history.I
 		}
 	}
 
-	batchID := rb.StartNestedBatch(chname, "chathistory")
+	batchID := rb.StartNestedBatch("chathistory", chname)
 	defer rb.EndNestedBatch(batchID)
 
 	for _, item := range items {
diff --git a/irc/client.go b/irc/client.go
index 1f74dee9..237b5aad 100644
--- a/irc/client.go
+++ b/irc/client.go
@@ -850,7 +850,7 @@ func (client *Client) replayPrivmsgHistory(rb *ResponseBuffer, items []history.I
 	if target == "" {
 		target = nick
 	}
-	batchID = rb.StartNestedBatch(target, "chathistory")
+	batchID = rb.StartNestedBatch("chathistory", target)
 
 	isSelfMessage := func(item *history.Item) bool {
 		// XXX: Params[0] is the message target. if the source of this message is an in-memory