diff --git a/src/main/java/cr0s/warpdrive/block/BlockAbstractContainer.java b/src/main/java/cr0s/warpdrive/block/BlockAbstractContainer.java
index 748ede7b..08d754a4 100644
--- a/src/main/java/cr0s/warpdrive/block/BlockAbstractContainer.java
+++ b/src/main/java/cr0s/warpdrive/block/BlockAbstractContainer.java
@@ -175,7 +175,9 @@ public abstract class BlockAbstractContainer extends BlockContainer implements I
 				final ItemStack itemStack = new ItemStack(item, 1, damageDropped(blockState));
 				final NBTTagCompound tagCompound = new NBTTagCompound();
 				((TileEntityAbstractBase) tileEntity).writeItemDropNBT(tagCompound);
-				itemStack.setTagCompound(tagCompound);
+				if (!tagCompound.isEmpty()) {
+					itemStack.setTagCompound(tagCompound);
+				}
 				drops.add(itemStack);
 			}
 		}
diff --git a/src/main/java/cr0s/warpdrive/block/TileEntityAbstractBase.java b/src/main/java/cr0s/warpdrive/block/TileEntityAbstractBase.java
index 86c9f851..0fbfb220 100644
--- a/src/main/java/cr0s/warpdrive/block/TileEntityAbstractBase.java
+++ b/src/main/java/cr0s/warpdrive/block/TileEntityAbstractBase.java
@@ -226,6 +226,7 @@ public abstract class TileEntityAbstractBase extends TileEntity implements IBloc
 	
 	public NBTTagCompound writeItemDropNBT(final NBTTagCompound tagCompound) {
 		writeToNBT(tagCompound);
+		tagCompound.removeTag("id");
 		tagCompound.removeTag("x");
 		tagCompound.removeTag("y");
 		tagCompound.removeTag("z");