diff --git a/CompatBot/Commands/Psn.cs b/CompatBot/Commands/Psn.cs
index 0f370786..fe2cdd61 100644
--- a/CompatBot/Commands/Psn.cs
+++ b/CompatBot/Commands/Psn.cs
@@ -26,7 +26,7 @@ internal static partial class Psn
         var ephemeral = !ctx.Channel.IsSpamChannel();
         productCode = productCode.ToUpperInvariant();
         await using var wdb = await ThumbnailDb.OpenWriteAsync().ConfigureAwait(false);
-        var item = wdb.Thumbnail.AsNoTracking().FirstOrDefault(t => t.ProductCode == productCode);
+        var item = wdb.Thumbnail.FirstOrDefault(t => t.ProductCode == productCode);
         if (item is null)
             await ctx.RespondAsync($"{Config.Reactions.Failure} Unknown product code {productCode}", ephemeral: true).ConfigureAwait(false);
         else
diff --git a/CompatBot/EventHandlers/GlobalMessageCache.cs b/CompatBot/EventHandlers/GlobalMessageCache.cs
index ee46d92c..6b9b07cd 100644
--- a/CompatBot/EventHandlers/GlobalMessageCache.cs
+++ b/CompatBot/EventHandlers/GlobalMessageCache.cs
@@ -10,10 +10,10 @@ internal static class GlobalMessageCache
     private static readonly TCache MessageQueue = new();
     private static readonly Func<DiscordMessage, ulong> KeyGen = m => m.Id;
 
-    public static Task OnMessageCreated(DiscordClient _, MessageCreatedEventArgs args)
+    public static Task<bool> OnMessageCreated(DiscordClient _, MessageCreatedEventArgs args)
     {
         if (args.Channel.IsPrivate)
-            return Task.CompletedTask;
+            return Task.FromResult(true);
 
         if (!MessageQueue.TryGetValue(args.Channel.Id, out var queue))
             lock (MessageQueue)
@@ -27,7 +27,7 @@ internal static class GlobalMessageCache
         while (queue.Count > Config.ChannelMessageHistorySize)
             lock(queue.SyncObj)
                 queue.TrimExcess();
-        return Task.CompletedTask;
+        return Task.FromResult(true);
     }
 
     public static Task OnMessageDeleted(DiscordClient _, MessageDeletedEventArgs args)
diff --git a/CompatBot/Program.cs b/CompatBot/Program.cs
index 8cdc0c8f..557c4911 100644
--- a/CompatBot/Program.cs
+++ b/CompatBot/Program.cs
@@ -237,12 +237,11 @@ internal static class Program
                     config.HandleMessageCreated(new MultiEventHandlerWrapper<MessageCreatedEventArgs>(
                         [
                             AntiSpamMessageHandler.OnMessageCreated,
-                            ContentFilterMonitor.OnMessageCreated, // should be first
+                            ContentFilterMonitor.OnMessageCreated,
                             DiscordInviteFilter.OnMessageCreated,
+                            GlobalMessageCache.OnMessageCreated,
                         ],
                         [
-                            //Watchdog.OnMessageCreated,
-                            GlobalMessageCache.OnMessageCreated,
                             mediaScreenshotMonitor.OnMessageCreated,
                             ProductCodeLookup.OnMessageCreated,
                             LogParsingHandler.OnMessageCreated,