diff --git a/wadsrc/static/zscript/inventory/weapons.txt b/wadsrc/static/zscript/inventory/weapons.txt
index 7eebdf3dc5..25817d8cee 100644
--- a/wadsrc/static/zscript/inventory/weapons.txt
+++ b/wadsrc/static/zscript/inventory/weapons.txt
@@ -717,10 +717,10 @@ class Weapon : StateProvider
 			ammoitem.Amount = MIN (amount, ammoitem.MaxAmount);
 			ammoitem.AttachToOwner (other);
 		}
-		else if (ammoitem.Amount < ammoitem.MaxAmount)
+		else if (ammoitem.Amount < ammoitem.MaxAmount || sv_unlimited_pickup)
 		{
 			ammoitem.Amount += amount;
-			if (ammoitem.Amount > ammoitem.MaxAmount)
+			if (ammoitem.Amount > ammoitem.MaxAmount && !sv_unlimited_pickup)
 			{
 				ammoitem.Amount = ammoitem.MaxAmount;
 			}