diff --git a/irc/handlers.go b/irc/handlers.go
index 1ca439fc..bcfe693a 100644
--- a/irc/handlers.go
+++ b/irc/handlers.go
@@ -3534,12 +3534,6 @@ func relaymsgHandler(server *Server, client *Client, msg ircmsg.Message, rb *Res
 	}
 	nuh := fmt.Sprintf("%s!%s@%s", nick, ident, hostname)
 
-	channel.AddHistoryItem(history.Item{
-		Type:    history.Privmsg,
-		Message: message,
-		Nick:    nuh,
-	}, "")
-
 	// 3 possibilities for tags:
 	// no tags, the relaymsg tag only, or the relaymsg tag together with all client-only tags
 	relayTag := map[string]string{
@@ -3557,6 +3551,13 @@ func relaymsgHandler(server *Server, client *Client, msg ircmsg.Message, rb *Res
 		}
 	}
 
+	channel.AddHistoryItem(history.Item{
+		Type:    history.Privmsg,
+		Message: message,
+		Nick:    nuh,
+		Tags:    fullTags,
+	}, "")
+
 	// actually send the message
 	channelName := channel.Name()
 	for _, member := range channel.Members() {