diff --git a/src/main/java/storagecraft/network/MessageStoragePull.java b/src/main/java/storagecraft/network/MessageStoragePull.java
index fec010f3d..a2a8de567 100644
--- a/src/main/java/storagecraft/network/MessageStoragePull.java
+++ b/src/main/java/storagecraft/network/MessageStoragePull.java
@@ -86,6 +86,10 @@ public class MessageStoragePull extends MessageHandlerPlayerToServer<MessageStor
 				{
 					quantity = 1;
 				}
+				else if (message.shift && quantity > item.getType().getItemStackLimit(item.toItemStack()))
+				{
+					quantity = item.getType().getItemStackLimit(item.toItemStack());
+				}
 
 				ItemStack took = controller.take(item.copy(quantity).toItemStack());