diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts
index 6cea3a729df..c6a9fd5a0ae 100644
--- a/src/modifier/modifier.ts
+++ b/src/modifier/modifier.ts
@@ -871,8 +871,8 @@ export class EvoTrackerModifier extends PokemonHeldItemModifier {
   }
 
   getMaxHeldItemCount(pokemon: Pokemon): integer {
-    this.stackCount = pokemon.evoCounter ?? this.stackCount;
-    return 1000 ;
+    this.stackCount = pokemon.evoCounter + pokemon.getHeldItems().filter(m => m instanceof DamageMoneyRewardModifier).length + pokemon.scene.findModifiers(m => m instanceof MoneyMultiplierModifier || m instanceof ExtraModifierModifier).length;
+    return 1000;
   }
 }