Hyperion - check currentEffect and only clear on disabled or undefined