diff --git a/code/datums/vending/stored_item.dm b/code/datums/vending/stored_item.dm
index d5e9c3cae0..92565a5f46 100644
--- a/code/datums/vending/stored_item.dm
+++ b/code/datums/vending/stored_item.dm
@@ -90,6 +90,8 @@
 		for(var/obj/item/stack/T as anything in instances)
 			if(count <= 0)
 				break
+			if(T.get_amount() <= count)
+				instances -= T
 			count -= T.transfer_to(S, count)
 
 	S.forceMove(product_location)
diff --git a/code/modules/food/kitchen/smartfridge/engineering.dm b/code/modules/food/kitchen/smartfridge/engineering.dm
index 8141ca496d..2a3a56368b 100644
--- a/code/modules/food/kitchen/smartfridge/engineering.dm
+++ b/code/modules/food/kitchen/smartfridge/engineering.dm
@@ -20,8 +20,10 @@
 	if(amount < 1)
 		return
 
+	count = min(count, amount)
+
 	while(count > 0)
-		var/obj/item/stack/S = I.get_product(get_turf(src), min(count, amount))
+		var/obj/item/stack/S = I.get_product(get_turf(src), count)
 		count -= S.amount
 	SStgui.update_uis(src)