diff --git a/PluralKit.Bot/Bot.cs b/PluralKit.Bot/Bot.cs
index 67979666..f3d06118 100644
--- a/PluralKit.Bot/Bot.cs
+++ b/PluralKit.Bot/Bot.cs
@@ -80,7 +80,7 @@ namespace PluralKit.Bot
 
             .AddSingleton<IDiscordClient, DiscordShardedClient>(_ => new DiscordShardedClient(new DiscordSocketConfig
             {
-                MessageCacheSize = 0,
+                MessageCacheSize = 10,
                 ExclusiveBulkDelete = true
             }))
             .AddSingleton<Bot>()
diff --git a/PluralKit.Bot/Services/ProxyService.cs b/PluralKit.Bot/Services/ProxyService.cs
index 8744c1ea..19f16e99 100644
--- a/PluralKit.Bot/Services/ProxyService.cs
+++ b/PluralKit.Bot/Services/ProxyService.cs
@@ -273,6 +273,10 @@ namespace PluralKit.Bot
 
         public async Task HandleMessageDeletedAsync(Cacheable<IMessage, ulong> message, ISocketMessageChannel channel)
         {
+            // Don't delete messages from the store if they aren't webhooks
+            // Non-webhook messages will never be stored anyway.
+            // If we're not sure (eg. message outside of cache), delete just to be sure.
+            if (message.HasValue && !message.Value.Author.IsWebhook) return;
             await _messageStorage.Delete(message.Id);
         }