diff --git a/src/phases.ts b/src/phases.ts
index b888fed7389..1ca20ceb013 100644
--- a/src/phases.ts
+++ b/src/phases.ts
@@ -2254,10 +2254,9 @@ export class MovePhase extends BattlePhase {
       
       if ((moveQueue.length && moveQueue[0].move === Moves.NONE) || !targets.length) {
         moveQueue.shift();
-        if (this.move.moveId === Moves.EXPLOSION || this.move.moveId === Moves.SELF_DESTRUCT || this.move.moveId === Moves.MISTY_EXPLOSION){ //Currently all explosions, AKA, kamikaze-attacks. There might be a better way to do it except to hardcode it, but i haven't found how yet.
-        } else {
+        if (!(this.move.moveId in [Moves.EXPLOSION,Moves.SELF_DESTRUCT,Moves.MISTY_EXPLOSION])){
           this.cancel();
-        }
+      }
       }
 
       if (this.cancelled) {