diff --git a/events/keys.go b/events/keys.go
index 8b11bc0..bf8d086 100644
--- a/events/keys.go
+++ b/events/keys.go
@@ -161,7 +161,12 @@ func permissionOverwriteKey(event *discordgo.PermissionOverwrite) string {
 }
 
 func messageUpdateKey(event *discordgo.MessageUpdate) string {
-	return event.ID + event.EditedTimestamp.String()
+	key := event.ID
+	if event.EditedTimestamp != nil {
+		key += event.EditedTimestamp.String()
+	}
+
+	return key
 }
 
 func messageReactionKey(event *discordgo.MessageReaction) string {