diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09891a011..8c1f6a97e 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### 1.0.2
 - Fixed processing patterns not handling item insertion sometimes (raoulvdberge)
+- Removed crafting task limit in crafting start GUI (raoulvdberge)
 
 ### 1.0.1
 - Fixed advanced tooltips showing in Grid when not configured to do so (raoulvdberge)
diff --git a/README.md b/README.md
index 9f5ad9fc1..92750b0b0 100755
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Refined Storage [![Build Status](https://travis-ci.org/raoulvdberge/refinedstorage.svg?branch=mc1.10)](https://travis-ci.org/raoulvdberge/refinedstorage) [![Download](https://api.bintray.com/packages/raoulvdberge/dev/refinedstorage/images/download.svg)](https://bintray.com/raoulvdberge/dev/refinedstorage/_latestVersion) ![CurseForge](http://cf.way2muchnoise.eu/full_243076_downloads.svg)
+# Refined Storage [![Build Status](https://travis-ci.org/raoulvdberge/refinedstorage.svg?branch=mc1.10)](https://travis-ci.org/raoulvdberge/refinedstorage) [![Download](https://api.bintray.com/packages/raoulvdberge/dev/refinedstorage/images/download.svg)](https://bintray.com/raoulvdberge/dev/refinedstorage/_latestVersion) [![CurseForge](http://cf.way2muchnoise.eu/full_243076_downloads.svg)](http://minecraft.curseforge.com/projects/refined-storage)
 
 A Minecraft mod all about storage.
 
diff --git a/src/main/java/refinedstorage/apiimpl/network/grid/ItemGridHandler.java b/src/main/java/refinedstorage/apiimpl/network/grid/ItemGridHandler.java
index 2d473e886..f49817ac1 100755
--- a/src/main/java/refinedstorage/apiimpl/network/grid/ItemGridHandler.java
+++ b/src/main/java/refinedstorage/apiimpl/network/grid/ItemGridHandler.java
@@ -12,8 +12,6 @@ import refinedstorage.api.network.grid.IItemGridHandler;
 import refinedstorage.api.storage.CompareUtils;
 
 public class ItemGridHandler implements IItemGridHandler {
-    public static final int MAX_CRAFTING_PER_REQUEST = 500;
-
     private INetworkMaster network;
 
     public ItemGridHandler(INetworkMaster network) {
@@ -118,7 +116,7 @@ public class ItemGridHandler implements IItemGridHandler {
 
     @Override
     public void onCraftingRequested(int hash, int quantity) {
-        if (quantity <= 0 || quantity > MAX_CRAFTING_PER_REQUEST) {
+        if (quantity <= 0) {
             return;
         }
 
diff --git a/src/main/java/refinedstorage/gui/grid/GuiCraftingSettings.java b/src/main/java/refinedstorage/gui/grid/GuiCraftingSettings.java
index 3638645d0..795021663 100755
--- a/src/main/java/refinedstorage/gui/grid/GuiCraftingSettings.java
+++ b/src/main/java/refinedstorage/gui/grid/GuiCraftingSettings.java
@@ -7,7 +7,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.fml.client.FMLClientHandler;
 import org.lwjgl.input.Keyboard;
 import refinedstorage.RefinedStorage;
-import refinedstorage.apiimpl.network.grid.ItemGridHandler;
 import refinedstorage.container.ContainerCraftingSettings;
 import refinedstorage.gui.GuiBase;
 import refinedstorage.gui.grid.stack.ClientStackItem;
@@ -111,7 +110,7 @@ public class GuiCraftingSettings extends GuiBase {
 
                     int newAmount = Integer.parseInt(incrementButton.displayString);
 
-                    newAmount = Math.min(Math.max(DEFAULT_AMOUNT, oldAmount + newAmount), ItemGridHandler.MAX_CRAFTING_PER_REQUEST);
+                    newAmount = Math.max(DEFAULT_AMOUNT, oldAmount + newAmount);
 
                     amountField.setText(String.valueOf(newAmount));
 
@@ -124,7 +123,7 @@ public class GuiCraftingSettings extends GuiBase {
     private void startRequest() {
         Integer quantity = Ints.tryParse(amountField.getText());
 
-        if (quantity != null && quantity > 0 && quantity <= ItemGridHandler.MAX_CRAFTING_PER_REQUEST) {
+        if (quantity != null && quantity > 0) {
             RefinedStorage.INSTANCE.network.sendToServer(new MessageGridCraftingStart(stack.getHash(), quantity));
 
             close();