diff --git a/Changelog.txt b/Changelog.txt
index c4f0b85b1..da01360c6 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -7,6 +7,9 @@ Key:
   ! Change
   - Removal
 
+Version 2.1.6
+    Fixed a bug where Salvage was giving back too many resources
+
 Version 2.1.5
     mcMMO no longer ignores cancelled events relating to the player left or right clicking
 
diff --git a/pom.xml b/pom.xml
index 3a0ced4ae..18176d399 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>2.1.5</version>
+    <version>2.1.6-SNAPSHOT</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>
diff --git a/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java b/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java
index 84a40b8ec..6151a6061 100644
--- a/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java
@@ -103,8 +103,8 @@ public class SalvageManager extends SkillManager {
             return;
         }
 
-        //Amount of materials to salvage based on rank
-        salvageableAmount = getSalvageableAmount();
+        salvageableAmount = Math.min(salvageableAmount, getSalvageableAmount()); // Always get at least something back, if you're capable of salvaging it.
+
 
         player.getInventory().setItemInMainHand(new ItemStack(Material.AIR));
         location.add(0.5, 1, 0.5);