diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index ce36a40697b..781427ca926 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -4762,7 +4762,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
       this.destroySubstitute();
       this.lapseTag(BattlerTagType.COMMANDED);
-      this.resetSummonData();
     }
 
     return result;
@@ -4824,7 +4823,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       );
       this.destroySubstitute();
       this.lapseTag(BattlerTagType.COMMANDED);
-      this.resetSummonData();
     }
     return damage;
   }
diff --git a/src/phases/faint-phase.ts b/src/phases/faint-phase.ts
index 01a556115a6..2e297704501 100644
--- a/src/phases/faint-phase.ts
+++ b/src/phases/faint-phase.ts
@@ -74,6 +74,8 @@ export class FaintPhase extends PokemonPhase {
 
     const faintPokemon = this.getPokemon();
 
+    faintPokemon.resetSummonData();
+
     if (!isNullOrUndefined(this.destinyTag) && !isNullOrUndefined(this.source)) {
       this.destinyTag.lapse(this.source, BattlerTagLapseType.CUSTOM);
     }