diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidMonitor.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidMonitor.java
index a5bc00bf3..16b7f7826 100644
--- a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidMonitor.java
+++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidMonitor.java
@@ -332,10 +332,15 @@ private void insertFluid(EntityPlayer player, int slotIndex, boolean shift) {
 
         if (targetStack.getItem() instanceof IFluidContainerItem fcItem) {
             if (emptiedTanks > 0) {
-                emptiedTanksStack = targetStack.copy();
-                emptiedTanksStack.stackSize = 1;
-                fcItem.drain(emptiedTanksStack, fluidPerContainer, true);
-                emptiedTanksStack.stackSize = emptiedTanks;
+                final ItemStack testDrainStack = targetStack.copy();
+                testDrainStack.stackSize = 1;
+                fcItem.drain(testDrainStack, fluidPerContainer, true);
+                if (testDrainStack.stackSize == 0) {
+                    emptiedTanksStack = null;
+                } else {
+                    emptiedTanksStack = testDrainStack.copy();
+                    emptiedTanksStack.stackSize = emptiedTanks;
+                }
             } else {
                 emptiedTanksStack = null;
             }
@@ -390,8 +395,7 @@ private void insertFluid(EntityPlayer player, int slotIndex, boolean shift) {
             } else if (partialTanksStack != null) {
                 player.inventory.setInventorySlotContents(slotIndex, partialTanksStack);
             } else {
-                player.inventory.setItemStack(null);
-                shouldSendStack = false;
+                player.inventory.setInventorySlotContents(slotIndex, null);
             }
         }
         if (shouldSendStack) {