diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6f28e62d..d535e622f 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 **Bugfixes**
 - Fixed getting wrong items back in grid
 - Fixed wrong item getting crafted
+- Fixed server lag with exporter and importer
 - Updated Forge to 1969
 - Updated JEI
 
diff --git a/src/main/java/refinedstorage/tile/controller/TileController.java b/src/main/java/refinedstorage/tile/controller/TileController.java
index ec4d08eb8..9d2585007 100755
--- a/src/main/java/refinedstorage/tile/controller/TileController.java
+++ b/src/main/java/refinedstorage/tile/controller/TileController.java
@@ -496,9 +496,6 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
         int sizePushed = remainder != null ? (orginalSize - remainder.stackSize) : orginalSize;
 
         if (!simulate && sizePushed > 0) {
-            updateItems();
-            updateItemsWithClient();
-
             for (int i = 0; i < sizePushed; ++i) {
                 if (!craftingTasks.empty()) {
                     ICraftingTask top = craftingTasks.peek();
@@ -508,6 +505,9 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
                     }
                 }
             }
+
+            updateItems();
+            updateItemsWithClient();
         }
 
         return remainder;