diff --git a/Changelog.txt b/Changelog.txt
index 9d7f4f4a6..9f3daebcf 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -7,7 +7,7 @@ Version 2.1.165
     mcMMO will now be compatible with changes to world height (1.17 compatibility)
     Added missing cooldown locale message 'Commands.Database.Cooldown'
     Added new locale message 'Taming.Summon.COTW.Removed'
-    mcMMO will ignore PlayerPickupItem events from "Fake-Player" NPCs if it recognizes them as such, this will prevent some issues
+    mcMMO will ignore EntityPickupItemEvents from "Fake-Player" NPCs if it recognizes them as such, this will prevent some compatibility issues with some plugins
 
     NOTES:
     Books dropped before this fix will not be usable and should just be chucked in lava, the broken books have blue names, the working books have yellow names.
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 8360825c9..ab597a8da 100644
--- a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
@@ -449,11 +449,11 @@ public class FishingManager extends SkillManager {
         }
 
         if(fishingSucceeds) {
-            fishingCatch.setItemStack(treasureDrop);
-
             if (Config.getInstance().getFishingExtraFish()) {
                 Misc.spawnItem(player.getEyeLocation(), fishingCatch.getItemStack(), ItemSpawnReason.FISHING_EXTRA_FISH);
             }
+
+            fishingCatch.setItemStack(treasureDrop);
         }
 
         applyXpGain(fishXp + treasureXp, XPGainReason.PVE);