diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/FluidStorageCache.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/FluidStorageCache.java
index cb62a40d6..ee06f8ee6 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/FluidStorageCache.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/FluidStorageCache.java
@@ -50,7 +50,9 @@ public class FluidStorageCache implements IStorageCache<FluidStack> {
             }
 
             for (FluidStack stack : storage.getStacks()) {
-                add(stack, stack.getAmount(), true, false);
+                if (!stack.isEmpty()) {
+                    add(stack, stack.getAmount(), true, false);
+                }
             }
         }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorageCache.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorageCache.java
index 97d18f5d5..7c485e491 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorageCache.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorageCache.java
@@ -50,7 +50,7 @@ public class FluidExternalStorageCache {
             if (actual.isEmpty() && !cached.isEmpty()) { // REMOVED
                 network.getFluidStorageCache().remove(cached, cached.getAmount(), true);
 
-                cache.set(i, null);
+                cache.set(i, FluidStack.EMPTY);
             } else if (!actual.isEmpty() && cached.isEmpty()) { // ADDED
                 network.getFluidStorageCache().add(actual, actual.getAmount(), false, true);