diff --git a/src/main/java/refinedstorage/network/MessageWirelessGridItems.java b/src/main/java/refinedstorage/network/MessageWirelessGridItems.java
index caaa13754..1e1601d2b 100755
--- a/src/main/java/refinedstorage/network/MessageWirelessGridItems.java
+++ b/src/main/java/refinedstorage/network/MessageWirelessGridItems.java
@@ -7,6 +7,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
 import refinedstorage.storage.ItemGroup;
 import refinedstorage.tile.grid.WirelessGrid;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class MessageWirelessGridItems implements IMessage, IMessageHandler<MessageWirelessGridItems, IMessage> {
@@ -23,13 +24,14 @@ public class MessageWirelessGridItems implements IMessage, IMessageHandler<Messa
     public void fromBytes(ByteBuf buf) {
         int size = buf.readInt();
 
-        WirelessGrid.ITEM_GROUPS.clear();
-
-        WirelessGrid.LAST_ITEM_GROUP_UPDATE = System.currentTimeMillis();
+        List<ItemGroup> groups = new ArrayList<ItemGroup>();
 
         for (int i = 0; i < size; ++i) {
-            WirelessGrid.ITEM_GROUPS.add(new ItemGroup(buf));
+            groups.add(new ItemGroup(buf));
         }
+
+        WirelessGrid.ITEM_GROUPS = groups;
+        WirelessGrid.LAST_ITEM_GROUP_UPDATE = System.currentTimeMillis();
     }
 
     @Override
diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java
index 57cd58939..9740fa143 100755
--- a/src/main/java/refinedstorage/tile/grid/TileGrid.java
+++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java
@@ -291,15 +291,17 @@ public class TileGrid extends TileMachine implements IGrid {
         sortingType = buf.readInt();
         searchBoxMode = buf.readInt();
 
-        itemGroups.clear();
+        List<ItemGroup> groups = new ArrayList<ItemGroup>();
 
         if (connected) {
             int size = buf.readInt();
 
             for (int i = 0; i < size; ++i) {
-                itemGroups.add(new ItemGroup(buf));
+                groups.add(new ItemGroup(buf));
             }
         }
+
+        itemGroups = groups;
     }
 
     @Override