diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGrid.java
index d33b039ee..245ce829e 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGrid.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGrid.java
@@ -314,7 +314,7 @@ public class PortableGrid implements IGrid, IPortableGrid {
 
     @Override
     public void onClosed(EntityPlayer player) {
-        if (!player.world.isRemote && storage != null) {
+        if (!player.getEntityWorld().isRemote && storage != null) {
             storage.writeToNBT();
 
             RSUtils.writeItems(disk, 4, stack.getTagCompound());
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java
index 2a01cfea8..d949d098a 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java
@@ -380,6 +380,10 @@ public class TilePortableGrid extends TileBase implements IGrid, IPortableGrid {
     public NBTTagCompound write(NBTTagCompound tag) {
         super.write(tag);
 
+        if (storage != null) {
+            storage.writeToNBT();
+        }
+
         tag.setInteger(NetworkNodeGrid.NBT_SORTING_DIRECTION, sortingDirection);
         tag.setInteger(NetworkNodeGrid.NBT_SORTING_TYPE, sortingType);
         tag.setInteger(NetworkNodeGrid.NBT_SEARCH_BOX_MODE, searchBoxMode);