diff --git a/irc.go b/irc.go
index d7c493a..7a14a54 100644
--- a/irc.go
+++ b/irc.go
@@ -263,6 +263,11 @@ func (ircHandler) handleTwitchUsernotice(m *irc.Message) {
 			"total":    m.Tags["msg-param-cumulative-months"],
 		}
 
+		if fields["message"] == m.Params[0] {
+			// Empty resub-messages will cause the message to be the channel name
+			delete(fields, "message")
+		}
+
 		// Update store
 		strDisplayName := string(displayName)
 		var duration int64