diff --git a/core/src/main/java/com/rexcantor64/triton/packetinterceptor/handlers/ChatPacketHandler.java b/core/src/main/java/com/rexcantor64/triton/packetinterceptor/handlers/ChatPacketHandler.java
index 02b6060a..ee57f3fb 100644
--- a/core/src/main/java/com/rexcantor64/triton/packetinterceptor/handlers/ChatPacketHandler.java
+++ b/core/src/main/java/com/rexcantor64/triton/packetinterceptor/handlers/ChatPacketHandler.java
@@ -65,11 +65,11 @@ public void onSystemChatMessagePacket(@NotNull PacketSendEvent event, @NotNull T
                         languagePlayer,
                         isActionbar ? actionbarSyntax : chatSyntax
                 )
-                .getResultOrToRemove(Component::empty)
-                .ifPresent(result -> {
+                .ifChanged(result -> {
                     packet.setMessage(result);
                     event.markForReEncode(true);
-                });
+                })
+                .ifToRemove(() -> event.setCancelled(true));
     }
 
 }