diff --git a/RotationSolver/Commands/RSCommands_Actions.cs b/RotationSolver/Commands/RSCommands_Actions.cs
index 16db40eee..f5b9dc5a5 100644
--- a/RotationSolver/Commands/RSCommands_Actions.cs
+++ b/RotationSolver/Commands/RSCommands_Actions.cs
@@ -43,7 +43,8 @@ internal static unsafe void DoAnAction(bool isGCD)
                     //Service.ChatGui.Print($"{act}, {act.Target.Name}, {ActionUpdater.AbilityRemainCount}, {ActionUpdater.WeaponElapsed}");
 #endif
                     //Change Target
-                    if (Service.TargetManager.Target is not PlayerCharacter && (act.Target?.IsNPCEnemy() ?? false))
+                    if ((Service.TargetManager.Target?.IsNPCEnemy() ?? true) 
+                        && (act.Target?.IsNPCEnemy() ?? false))
                     {
                         Service.TargetManager.SetTarget(act.Target);
                     }