diff --git a/CHANGELOG.md b/CHANGELOG.md
index 895c8a8fa..2fe89796b 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Refined Storage Changelog
 
+### 0.8.12
+**Bugfixes**
+- Fixed dupe bug when shift clicking output slot in grid
+
 ### 0.8.11
 **Bugfixes**
 - Fixed minor dupe bug with JEI transferring
diff --git a/src/main/java/refinedstorage/container/ContainerGrid.java b/src/main/java/refinedstorage/container/ContainerGrid.java
index be2bbc681..775e32ddb 100755
--- a/src/main/java/refinedstorage/container/ContainerGrid.java
+++ b/src/main/java/refinedstorage/container/ContainerGrid.java
@@ -96,12 +96,14 @@ public class ContainerGrid extends ContainerBase {
         if (!player.worldObj.isRemote) {
             Slot slot = inventorySlots.get(slotIndex);
 
-            if (slot == craftingResultSlot) {
-                ((TileGrid) grid).onCraftedShift(this, player);
-            } else if (grid.getGridHandler() != null && slot != patternResultSlot && !(slot instanceof SlotSpecimenLegacy) && slot.getHasStack()) {
-                slot.putStack(grid.getGridHandler().onInsert(slot.getStack()));
+            if (slot.getHasStack()) {
+                if (slot == craftingResultSlot) {
+                    ((TileGrid) grid).onCraftedShift(this, player);
+                } else if (grid.getGridHandler() != null && slot != patternResultSlot && !(slot instanceof SlotSpecimenLegacy)) {
+                    slot.putStack(grid.getGridHandler().onInsert(slot.getStack()));
 
-                detectAndSendChanges();
+                    detectAndSendChanges();
+                }
             }
         }