diff --git a/include/battle_gimmick.h b/include/battle_gimmick.h
index 42b8c7255a..84b1d6b26a 100644
--- a/include/battle_gimmick.h
+++ b/include/battle_gimmick.h
@@ -35,6 +35,7 @@ void SetGimmickAsActivated(u32 battler, enum Gimmick gimmick);
 void ChangeGimmickTriggerSprite(u32 spriteId, u32 animId);
 void CreateGimmickTriggerSprite(u32 battler);
 bool32 IsGimmickTriggerSpriteActive(void);
+bool32 IsGimmickTriggerSpriteMatchingBattler(u32 battler);
 void HideGimmickTriggerSprite(void);
 void DestroyGimmickTriggerSprite(void);
 
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 3361ce2f65..856bf5d30b 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -2090,6 +2090,8 @@ void PlayerHandleChooseMove(u32 battler)
 
         if (!IsGimmickTriggerSpriteActive())
             gBattleStruct->gimmick.triggerSpriteId = 0xFF;
+        else if (!IsGimmickTriggerSpriteMatchingBattler(battler))
+            DestroyGimmickTriggerSprite();
         if (!(gBattleStruct->gimmick.usableGimmick[battler] == GIMMICK_Z_MOVE && !gBattleStruct->zmove.viable))
             CreateGimmickTriggerSprite(battler);
 
diff --git a/src/battle_gimmick.c b/src/battle_gimmick.c
index 76ea80a4f6..38d60d4365 100644
--- a/src/battle_gimmick.c
+++ b/src/battle_gimmick.c
@@ -178,6 +178,13 @@ bool32 IsGimmickTriggerSpriteActive(void)
         return FALSE;
 }
 
+bool32 IsGimmickTriggerSpriteMatchingBattler(u32 battler)
+{
+    if (battler == gSprites[gBattleStruct->gimmick.triggerSpriteId].tBattler)
+        return TRUE;
+    return FALSE;
+}
+
 void HideGimmickTriggerSprite(void)
 {
     if (gBattleStruct->gimmick.triggerSpriteId != 0xFF)