diff --git a/src/main/java/meteordevelopment/meteorclient/mixin/ChatComponentAccessor.java b/src/main/java/meteordevelopment/meteorclient/mixin/ChatComponentAccessor.java
index a171c06aa4..b890607031 100644
--- a/src/main/java/meteordevelopment/meteorclient/mixin/ChatComponentAccessor.java
+++ b/src/main/java/meteordevelopment/meteorclient/mixin/ChatComponentAccessor.java
@@ -9,6 +9,7 @@
 import net.minecraft.client.multiplayer.chat.GuiMessage;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
+import org.spongepowered.asm.mixin.gen.Invoker;
 
 import java.util.List;
 
@@ -19,4 +20,7 @@ public interface ChatComponentAccessor {
 
     @Accessor("allMessages")
     List<GuiMessage> meteor$getAllMessages();
+
+    @Invoker("refreshTrimmedMessages")
+    void meteor$refreshTrimmedMessages();
 }
diff --git a/src/main/java/meteordevelopment/meteorclient/systems/modules/misc/BetterChat.java b/src/main/java/meteordevelopment/meteorclient/systems/modules/misc/BetterChat.java
index 1c77e88557..bcefbf819c 100644
--- a/src/main/java/meteordevelopment/meteorclient/systems/modules/misc/BetterChat.java
+++ b/src/main/java/meteordevelopment/meteorclient/systems/modules/misc/BetterChat.java
@@ -363,21 +363,8 @@ private MutableComponent appendAntiSpam(@UnknownNullability Component text) {
         }
 
         if (returnText != null) {
-            List<GuiMessage.Line> visible = ((ChatComponentAccessor) mc.gui.getChat()).meteor$getTrimmedMessages();
-
-            int start = -1;
-            for (int i = 0; i < messageIndex; i++) {
-                start += lines.getInt(i);
-            }
-
-            int i = lines.getInt(messageIndex);
-            while (i > 0) {
-                visible.remove(start + 1);
-                i--;
-            }
-
             messages.remove(messageIndex);
-            lines.removeInt(messageIndex);
+            ((ChatComponentAccessor) mc.gui.getChat()).meteor$refreshTrimmedMessages();
         }
 
         return returnText;