diff --git a/src/main/java/li/cil/oc2/common/item/AbstractBlockDeviceItem.java b/src/main/java/li/cil/oc2/common/item/AbstractBlockDeviceItem.java
index a53bd7cc..16bb7cbb 100644
--- a/src/main/java/li/cil/oc2/common/item/AbstractBlockDeviceItem.java
+++ b/src/main/java/li/cil/oc2/common/item/AbstractBlockDeviceItem.java
@@ -55,12 +55,12 @@ public abstract class AbstractBlockDeviceItem extends ModItem {
 
     public ItemStack withData(final ItemStack stack, final BlockDeviceData data) {
         if (stack.isEmpty() || stack.getItem() != this) {
-            return stack;
+            return ItemStack.EMPTY;
         }
 
         final ResourceLocation key = BlockDeviceDataRegistry.getKey(data);
         if (key == null) {
-            return stack;
+            return ItemStack.EMPTY;
         }
 
         ItemStackUtils.getOrCreateModDataTag(stack).putString(DATA_TAG_NAME, key.toString());
diff --git a/src/main/java/li/cil/oc2/common/item/FlashMemoryWithExternalDataItem.java b/src/main/java/li/cil/oc2/common/item/FlashMemoryWithExternalDataItem.java
index e606e704..9a27d0d7 100644
--- a/src/main/java/li/cil/oc2/common/item/FlashMemoryWithExternalDataItem.java
+++ b/src/main/java/li/cil/oc2/common/item/FlashMemoryWithExternalDataItem.java
@@ -53,12 +53,12 @@ public final class FlashMemoryWithExternalDataItem extends ModItem {
 
     public ItemStack withFirmware(final ItemStack stack, final Firmware firmware) {
         if (stack.isEmpty() || stack.getItem() != this) {
-            return stack;
+            return ItemStack.EMPTY;
         }
 
         final ResourceLocation key = FirmwareRegistry.getKey(firmware);
         if (key == null) {
-            return stack;
+            return ItemStack.EMPTY;
         }
 
         ItemStackUtils.getOrCreateModDataTag(stack).putString(FIRMWARE_TAG_NAME, key.toString());