diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_6to1_21_5/Protocol1_21_6To1_21_5.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_6to1_21_5/Protocol1_21_6To1_21_5.java
index 666834f5b..dd68e47f0 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_6to1_21_5/Protocol1_21_6To1_21_5.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_6to1_21_5/Protocol1_21_6To1_21_5.java
@@ -178,14 +178,8 @@ public void handleArgument(final PacketWrapper wrapper, final String argumentTyp
         registerClientbound(ClientboundPackets1_21_6.SERVER_LINKS, this::storeServerLinks);
         registerClientbound(ClientboundConfigurationPackets1_21_6.SERVER_LINKS, this::storeServerLinks);
 
-        registerServerbound(ServerboundPackets1_21_5.CHAT_COMMAND, wrapper -> {
-            final String command = wrapper.passthrough(Types.STRING);
-
-            final ClickEvents clickEvents = wrapper.user().get(ClickEvents.class);
-            if (clickEvents.handleChatCommand(wrapper.user(), command)) {
-                wrapper.cancel();
-            }
-        });
+        registerServerbound(ServerboundPackets1_21_5.CHAT_COMMAND, this::handleClickEvents);
+        registerServerbound(ServerboundPackets1_21_5.CHAT_COMMAND_SIGNED, this::handleClickEvents);
 
         // The ones below are specific to the chest dialog view provider
         registerServerbound(ServerboundPackets1_21_5.CONTAINER_CLOSE, wrapper -> {
@@ -312,6 +306,15 @@ private void storeServerLinks(final PacketWrapper wrapper) {
         wrapper.user().put(serverLinks);
     }
 
+    private void handleClickEvents(final PacketWrapper wrapper) {
+        final String command = wrapper.passthrough(Types.STRING);
+
+        final ClickEvents clickEvents = wrapper.user().get(ClickEvents.class);
+        if (clickEvents.handleChatCommand(wrapper.user(), command)) {
+            wrapper.cancel();
+        }
+    }
+
     @Override
     public void init(final UserConnection user) {
         addEntityTracker(user, new EntityTrackerBase(user, EntityTypes1_21_6.PLAYER));