diff --git a/src/main/java/com/gtnewhorizon/structurelib/alignment/constructable/ChannelDataAccessor.java b/src/main/java/com/gtnewhorizon/structurelib/alignment/constructable/ChannelDataAccessor.java
index d7d34784..6b12efd3 100644
--- a/src/main/java/com/gtnewhorizon/structurelib/alignment/constructable/ChannelDataAccessor.java
+++ b/src/main/java/com/gtnewhorizon/structurelib/alignment/constructable/ChannelDataAccessor.java
@@ -146,7 +146,12 @@ public class ChannelDataAccessor {
      */
     public static void wipeChannelData(ItemStack masterStack) {
         if (masterStack == null) throw new IllegalArgumentException();
-        if (masterStack.stackTagCompound != null) masterStack.stackTagCompound.removeTag(SECONDARY_HINT_TAG);
+        if (masterStack.stackTagCompound != null) {
+            masterStack.stackTagCompound.removeTag(SECONDARY_HINT_TAG);
+            if (masterStack.stackTagCompound.hasNoTags()) {
+                masterStack.stackTagCompound = null;
+            }
+        }
     }
 
     /**