diff --git a/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java b/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java
index 56f363ba..dc760010 100644
--- a/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java
+++ b/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java
@@ -200,7 +200,7 @@ public class FluidCellInventory implements IFluidCellInventory {
 
     @Override
     public long getRemainingFluidTypes() {
-        final long basedOnStorage = this.getFreeBytes() / this.getBytesPerType();
+        final long basedOnStorage = this.getFreeBytes() / Math.max(1, this.getBytesPerType());
         final long baseOnTotal = this.getTotalFluidTypes() - this.getStoredFluidTypes();
         return Math.min(basedOnStorage, baseOnTotal);
     }