diff --git a/src/main/java/land/chipmunk/chipmunkmod/modules/CommandCore.java b/src/main/java/land/chipmunk/chipmunkmod/modules/CommandCore.java
index d0c8ff4..cdf9c53 100644
--- a/src/main/java/land/chipmunk/chipmunkmod/modules/CommandCore.java
+++ b/src/main/java/land/chipmunk/chipmunkmod/modules/CommandCore.java
@@ -140,16 +140,40 @@ public class CommandCore {
     final ClientConnection connection = client.getNetworkHandler().getConnection();
     final BlockPos currentBlock = currentBlockAbsolute();
 
-    connection.send(
-            new UpdateCommandBlockC2SPacket(
-                    currentBlock,
-                    command,
-                    KaboomCheck.INSTANCE.isKaboom ? CommandBlockBlockEntity.Type.AUTO : CommandBlockBlockEntity.Type.REDSTONE,
-                    false,
-                    false,
-                    true
-            )
-    );
+    if (KaboomCheck.INSTANCE.isKaboom) {
+      connection.send(
+              new UpdateCommandBlockC2SPacket(
+                      currentBlock,
+                      command,
+                      CommandBlockBlockEntity.Type.AUTO,
+                      false,
+                      false,
+                      true
+              )
+      );
+    } else {
+      connection.send(
+              new UpdateCommandBlockC2SPacket(
+                      currentBlock,
+                      "",
+                      CommandBlockBlockEntity.Type.REDSTONE,
+                      false,
+                      false,
+                      false
+              )
+      );
+
+      connection.send(
+              new UpdateCommandBlockC2SPacket(
+                      currentBlock,
+                      command,
+                      CommandBlockBlockEntity.Type.REDSTONE,
+                      false,
+                      false,
+                      true
+              )
+      );
+    }
 
     incrementCurrentBlock();
   }
@@ -158,16 +182,40 @@ public class CommandCore {
     final ClientConnection connection = client.getNetworkHandler().getConnection();
     final BlockPos currentBlock = currentBlockAbsolute();
 
-    connection.send(
-            new UpdateCommandBlockC2SPacket(
-                    currentBlock,
-                    command,
-                    KaboomCheck.INSTANCE.isKaboom ? CommandBlockBlockEntity.Type.AUTO : CommandBlockBlockEntity.Type.REDSTONE,
-                    true,
-                    false,
-                    true
-            )
-    );
+    if (KaboomCheck.INSTANCE.isKaboom) {
+      connection.send(
+              new UpdateCommandBlockC2SPacket(
+                      currentBlock,
+                      command,
+                      CommandBlockBlockEntity.Type.AUTO,
+                      true,
+                      false,
+                      true
+              )
+      );
+    } else {
+      connection.send(
+              new UpdateCommandBlockC2SPacket(
+                      currentBlock,
+                      "",
+                      CommandBlockBlockEntity.Type.REDSTONE,
+                      true,
+                      false,
+                      false
+              )
+      );
+
+      connection.send(
+              new UpdateCommandBlockC2SPacket(
+                      currentBlock,
+                      command,
+                      CommandBlockBlockEntity.Type.REDSTONE,
+                      true,
+                      false,
+                      true
+              )
+      );
+    }
 
     incrementCurrentBlock();