diff --git a/upstream.go b/upstream.go
index 80f0517..5bffe3d 100644
--- a/upstream.go
+++ b/upstream.go
@@ -49,7 +49,8 @@ var permanentUpstreamCaps = map[string]bool{
 // storableMessageTags is the static list of message tags that will cause
 // a TAGMSG to be stored.
 var storableMessageTags = map[string]bool{
-	"+react": true,
+	"+draft/react": true,
+	"+react":       true,
 }
 
 type registrationError struct {
@@ -2099,8 +2100,8 @@ func (uc *upstreamConn) appendLog(entity string, msg *irc.Message) (msgID string
 	}
 	if msg.Command == "TAGMSG" {
 		store := false
-		for tag := range storableMessageTags {
-			if _, ok := msg.Tags[tag]; ok {
+		for tag := range msg.Tags {
+			if storableMessageTags[tag] {
 				store = true
 				break
 			}