diff --git a/src/pokemon.c b/src/pokemon.c
index 926286caff..2daae8190b 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -1150,7 +1150,7 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV,
                 totalRerolls += I_SHINY_CHARM_ADDITIONAL_ROLLS;
             if (LURE_STEP_COUNT != 0)
                 totalRerolls += 1;
-            if (IsCurrentEncounterFishing())
+            if (I_FISHING_CHAIN && IsCurrentEncounterFishing())
                 totalRerolls += CalculateChainFishingShinyRolls();
 
             while (GET_SHINY_VALUE(value, personality) >= SHINY_ODDS && totalRerolls > 0)
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index 273f9f312a..1e9c13829a 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -919,7 +919,7 @@ static void SetEncounterFishing(void)
 
 u32 CalculateChainFishingShinyRolls(void)
 {
-    return (1 + (2 * GetCurrentChainFishingDexNavStreak()));
+    return 2 * GetCurrentChainFishingDexNavStreak();
 }
 
 static void SetLastFishingSpecies(u32 species)