diff --git a/CHANGELOG.md b/CHANGELOG.md
index e86037e0b..a64d92392 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Refined Storage Changelog
 
+### 0.5.5
+**Bugfixes**
+- Fixed Grid crash
+
 ### 0.5.4
 **Bugfixes**
 - Fixed machines out of the Controller's chunk range only connecting after block break when rejoining the world
diff --git a/build.gradle b/build.gradle
index 82f17b11c..e8058496b 100755
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 }
 apply plugin: 'net.minecraftforge.gradle.forge'
 
-version = "0.5.4"
+version = "0.5.5"
 group = "refinedstorage"
 archivesBaseName = "refinedstorage"
 
diff --git a/src/main/java/refinedstorage/RefinedStorage.java b/src/main/java/refinedstorage/RefinedStorage.java
index 39fd1a193..d2ba4aa42 100755
--- a/src/main/java/refinedstorage/RefinedStorage.java
+++ b/src/main/java/refinedstorage/RefinedStorage.java
@@ -19,7 +19,7 @@ import refinedstorage.proxy.CommonProxy;
 @Mod(modid = RefinedStorage.ID, version = RefinedStorage.VERSION)
 public final class RefinedStorage {
     public static final String ID = "refinedstorage";
-    public static final String VERSION = "0.5.4";
+    public static final String VERSION = "0.5.5";
 
     public static final SimpleNetworkWrapper NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(ID);
 
diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java
index 3956ebeb0..8a2468fbf 100755
--- a/src/main/java/refinedstorage/tile/grid/TileGrid.java
+++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java
@@ -282,6 +282,8 @@ public class TileGrid extends TileMachine implements IGrid {
             for (ItemGroup group : controller.getItemGroups()) {
                 group.toBytes(buf, controller.getItemGroups().indexOf(group));
             }
+        } else {
+            buf.writeInt(0);
         }
     }
 
@@ -295,12 +297,10 @@ public class TileGrid extends TileMachine implements IGrid {
 
         List<ItemGroup> groups = new ArrayList<ItemGroup>();
 
-        if (connected) {
-            int size = buf.readInt();
+        int size = buf.readInt();
 
-            for (int i = 0; i < size; ++i) {
-                groups.add(new ItemGroup(buf));
-            }
+        for (int i = 0; i < size; ++i) {
+            groups.add(new ItemGroup(buf));
         }
 
         itemGroups = groups;
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index 8e69e5497..69839aa06 100755
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -3,7 +3,7 @@
       "modid": "refinedstorage",
       "name": "Refined Storage",
       "description": "A Minecraft mod all about storage.",
-      "version": "0.5.4",
+      "version": "0.5.5",
       "mcversion": "1.9",
       "url": "",
       "updateUrl": "",