diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9357d5f2f..412af3236 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Fixed not being able to extract half a stack of items with max stack size 1 in Grid when using right click (raoulvdberge)
 - Fixed 2 same stacks using capabilities without NBT tag not treated equal (raoulvdberge)
 - Changed stack quantity of craftable items from 1 to 0 to fix Quantity Sorting (ineternet)
+- Changed fluid stack amount to not display "0" anymore (ineternet)
 
 ### 1.5.31
 - Improved the "cannot craft! loop in processing..." error message (raoulvdberge)
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackFluid.java
index 5598db37d..dbb17fc18 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackFluid.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackFluid.java
@@ -63,7 +63,11 @@ public class GridStackFluid implements IGridStack {
     public void draw(GuiBase gui, int x, int y) {
         GuiBase.FLUID_RENDERER.draw(gui.mc, x, y, stack);
 
-        gui.drawQuantity(x, y, API.instance().getQuantityFormatter().formatWithUnits((int) ((float) stack.amount / 1000F)));
+        float amountRaw = ((float) stack.amount / 1000F);
+        int amount = (int) amountRaw;
+        String formattedAmount = amount >= 1 ? API.instance().getQuantityFormatter().formatWithUnits(amount) : String.format("%.1f", amountRaw);
+        
+        gui.drawQuantity(x, y, formattedAmount);
     }
 
     @Override