diff --git a/Changelog.txt b/Changelog.txt
index 07e4e18f3..4d45a0f9a 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -113,6 +113,7 @@ Version 2.1.0
  ! (Skills) Herbalism's Green Thumb now uses a rank system
  ! (Skills) Shake now uses a rank system
  ! (Skills) Flux Mining now uses a rank system
+ ! (Skills) Removed traps from fishing
  = (Skills) Shake now sends custom damage types for better nocheat compat
  ! (Config) Unarmed.IronArm in advanced.yml is now Unarmed.IronArmStyle
  ! (Config) Unarmed.Deflect in advanced.yml is now Unarmed.ArrowDeflect
diff --git a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
index c5fc8f3c8..589b206c5 100644
--- a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
@@ -463,10 +463,10 @@ public class FishingManager extends SkillManager {
             double dropRate = TreasureConfig.getInstance().getItemDropRate(getLootTier(), rarity);
 
             if (diceRoll <= dropRate) {
-                if (rarity == Rarity.TRAP) {
+                /*if (rarity == Rarity.TRAP) {
                     handleTraps();
                     break;
-                }
+                }*/
 
                 List<FishingTreasure> fishingTreasures = TreasureConfig.getInstance().fishingRewards.get(rarity);