diff --git a/src/main/java/li/cil/oc2/client/item/CustomItemModelProperties.java b/src/main/java/li/cil/oc2/client/item/CustomItemModelProperties.java
index 9a69262e..4eaafe97 100644
--- a/src/main/java/li/cil/oc2/client/item/CustomItemModelProperties.java
+++ b/src/main/java/li/cil/oc2/client/item/CustomItemModelProperties.java
@@ -2,6 +2,7 @@ package li.cil.oc2.client.item;
 
 import li.cil.oc2.api.API;
 import li.cil.oc2.common.item.AbstractStorageItem;
+import li.cil.oc2.common.item.HardDriveItem;
 import li.cil.oc2.common.item.Items;
 import net.minecraft.item.ItemModelsProperties;
 import net.minecraft.util.ResourceLocation;
@@ -15,6 +16,6 @@ public final class CustomItemModelProperties {
         ItemModelsProperties.registerProperty(Items.MEMORY_ITEM.get(), CustomItemModelProperties.CAPACITY_PROPERTY,
                 (stack, world, entity) -> AbstractStorageItem.getCapacity(stack));
         ItemModelsProperties.registerProperty(Items.HARD_DRIVE_ITEM.get(), CustomItemModelProperties.CAPACITY_PROPERTY,
-                (stack, world, entity) -> AbstractStorageItem.getCapacity(stack));
+                (stack, world, entity) -> HardDriveItem.getBaseBlockDevice(stack) != null ? Integer.MAX_VALUE : AbstractStorageItem.getCapacity(stack));
     }
 }