diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_6to1_21_5/rewriter/ComponentRewriter1_21_6.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_6to1_21_5/rewriter/ComponentRewriter1_21_6.java
index 09c5482fd..82ac03d7e 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_6to1_21_5/rewriter/ComponentRewriter1_21_6.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_6to1_21_5/rewriter/ComponentRewriter1_21_6.java
@@ -20,7 +20,6 @@
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.rewriters.text.NBTComponentRewriter;
-import com.viaversion.viabackwards.protocol.v1_21_6to1_21_5.storage.ChestDialogStorage;
 import com.viaversion.viabackwards.protocol.v1_21_6to1_21_5.storage.ClickEvents;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ClientboundPacket1_21_6;
@@ -42,15 +41,6 @@ protected void processCompoundTag(final UserConnection connection, final Compoun
 
         final String action = clickEvent.getString("action");
 
-        final ChestDialogStorage chestDialogStorage = connection.get(ChestDialogStorage.class);
-        if (chestDialogStorage != null) {
-            // Short way out - remove when in dialog, buttons are handled separately
-            if ("show_dialog".equals(action) || "custom".equals(action)) {
-                tag.remove("click_event");
-                return;
-            }
-        }
-
         // Make them run a command generated by us executing the actual logic
         if ("show_dialog".equals(action)) {
             final ClickEvents clickEvents = connection.get(ClickEvents.class);