diff --git a/src/systems/starfinder.js b/src/systems/starfinder.js
index 6841b2f..6d6c3c9 100644
--- a/src/systems/starfinder.js
+++ b/src/systems/starfinder.js
@@ -130,8 +130,8 @@ export class starfinder{
                 await effect.delete();
         }
         else {
-            const effect = CONFIG.statusEffects.find(e => e.id === condition);
-            await token.toggleEffect(effect);
+            if (this.getConditionActive(token,condition)) token.actor.setCondition(condition,false);
+            else token.actor.setCondition(condition,true);
         }
         return true;
     }