diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb145216c..efbd354bb 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@
 - Fixed Disk Manipulator not extracting items (ineternet)
 - Fixed filter slots not caring about max stack size (raoulvdberge)
 - Fixed model warning about Portable Grid (raoulvdberge)
+- Fixed crash when autocompleting Ender IO recipes from JEI (raoulvdberge)
+- Fixed Grid not always using all combinations when using JEI autocompletion (raoulvdberge)
 - Increased Grid performance (raoulvdberge)
 - Various internal refactors (raoulvdberge)
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeTransferHandlerGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeTransferHandlerGrid.java
index 5b457240b..e970baa33 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeTransferHandlerGrid.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeTransferHandlerGrid.java
@@ -60,18 +60,18 @@ public class RecipeTransferHandlerGrid implements IRecipeTransferHandler {
                         IGuiIngredient<ItemStack> ingredient = inputs.get(slot.getSlotIndex() + 1);
 
                         if (ingredient != null) {
-                            List<ItemStack> possibleItems = ingredient.getAllIngredients();
-
                             NBTTagList tags = new NBTTagList();
 
-                            for (int i = 0; i < possibleItems.size(); ++i) {
-                                if (i >= 5) {
-                                    break; // Max 5 possible items to avoid reaching max network packet size
-                                }
+                            for (ItemStack possibleItem : ingredient.getAllIngredients()) {
+                                if (possibleItem != null) {
+                                    possibleItem = possibleItem.copy();
+                                    possibleItem.setTagCompound(possibleItem.getItem().getNBTShareTag(possibleItem));
 
-                                NBTTagCompound tag = new NBTTagCompound();
-                                possibleItems.get(i).writeToNBT(tag);
-                                tags.appendTag(tag);
+                                    NBTTagCompound tag = new NBTTagCompound();
+                                    possibleItem.writeToNBT(tag);
+
+                                    tags.appendTag(tag);
+                                }
                             }
 
                             recipe.setTag("#" + slot.getSlotIndex(), tags);