diff --git a/src/main/java/com/prometheus/spigot/PrometheusSpigotPlugin.java b/src/main/java/com/prometheus/spigot/PrometheusSpigotPlugin.java
index 7a1cc3d..cf0c9e1 100644
--- a/src/main/java/com/prometheus/spigot/PrometheusSpigotPlugin.java
+++ b/src/main/java/com/prometheus/spigot/PrometheusSpigotPlugin.java
@@ -3,7 +3,7 @@ package com.prometheus.spigot;
 import com.prometheus.spigot.http.MetricsHttpHandler;
 import com.prometheus.spigot.listeners.BlockBreakListener;
 import com.prometheus.spigot.listeners.BlockPlaceListener;
-import com.prometheus.spigot.listeners.ChatListener;
+import com.prometheus.spigot.listeners.ChatMessageListener;
 import com.prometheus.spigot.listeners.ChunkListener;
 import com.prometheus.spigot.listeners.CommandListener;
 import com.prometheus.spigot.listeners.ConnectionListener;
@@ -76,7 +76,7 @@ public final class PrometheusSpigotPlugin extends JavaPlugin {
         pluginManager.registerEvents(new BlockBreakListener(metricsRegistry), this);
         pluginManager.registerEvents(new BlockPlaceListener(metricsRegistry), this);
         pluginManager.registerEvents(new DeathListener(metricsRegistry), this);
-        pluginManager.registerEvents(new ChatListener(metricsRegistry), this);
+        pluginManager.registerEvents(new ChatMessageListener(metricsRegistry), this);
         pluginManager.registerEvents(new MoveListener(metricsRegistry, countBlockMovementOnly), this);
         pluginManager.registerEvents(new ConnectionListener(metricsRegistry), this);
         pluginManager.registerEvents(new CommandListener(metricsRegistry), this);
diff --git a/src/main/java/com/prometheus/spigot/listeners/ChatListener.java b/src/main/java/com/prometheus/spigot/listeners/ChatListener.java
deleted file mode 100644
index 29926c7..0000000
--- a/src/main/java/com/prometheus/spigot/listeners/ChatListener.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.prometheus.spigot.listeners;
-
-import com.prometheus.spigot.metrics.MetricsRegistry;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.AsyncPlayerChatEvent;
-
-public final class ChatListener implements Listener {
-    private final MetricsRegistry registry;
-
-    public ChatListener(MetricsRegistry registry) {
-        this.registry = registry;
-    }
-
-    @EventHandler
-    public void onChat(AsyncPlayerChatEvent event) {
-        registry.incrementChatMessages();
-    }
-}
diff --git a/src/main/java/com/prometheus/spigot/listeners/ChatMessageListener.java b/src/main/java/com/prometheus/spigot/listeners/ChatMessageListener.java
new file mode 100644
index 0000000..daeb3e3
--- /dev/null
+++ b/src/main/java/com/prometheus/spigot/listeners/ChatMessageListener.java
@@ -0,0 +1,20 @@
+package com.prometheus.spigot.listeners;
+
+import com.prometheus.spigot.metrics.MetricsRegistry;
+import io.papermc.paper.event.player.AsyncChatEvent;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+public final class ChatMessageListener implements Listener {
+    private final MetricsRegistry registry;
+
+    public ChatMessageListener(MetricsRegistry registry) {
+        this.registry = registry;
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onChat(AsyncChatEvent event) {
+        registry.incrementChatMessages();
+    }
+}