diff --git a/Assets/Scripts/Model/Content/SecondEdition/Standard/Pilots/FO/TIEWiWhisper/Whirlwind.cs b/Assets/Scripts/Model/Content/SecondEdition/Standard/Pilots/FO/TIEWiWhisper/Whirlwind.cs
index 791bf85078..4383d82ae0 100644
--- a/Assets/Scripts/Model/Content/SecondEdition/Standard/Pilots/FO/TIEWiWhisper/Whirlwind.cs
+++ b/Assets/Scripts/Model/Content/SecondEdition/Standard/Pilots/FO/TIEWiWhisper/Whirlwind.cs
@@ -99,8 +99,13 @@ private void DoRemoveJamTokens(int count, Action callback)
         {
             Messages.ShowInfo($"{HostShip.PilotInfo.PilotName}: {count} Jam token(s) are removed");
 
-            List<GenericToken> tokensToRemove = HostShip.Tokens.GetAllTokens().Where( n => n is JamToken).Take(count).ToList();
-            HostShip.Tokens.RemoveTokens(tokensToRemove, callback);
+            List<GenericToken> tokensToRemove = HostShip.Tokens.GetAllTokens()
+                .Where(n => n is JamToken)
+                .ToList();
+                
+            tokensToRemove.Count > 0 ?
+                HostShip.Tokens.RemoveTokens(tokensToRemove.Take(count).ToList(), callback) :
+                callback();
         }
 
         private void GainFocusTokens()