diff --git a/src/main/java/com/alttd/frameSpawners/FrameSpawnerPlayer.java b/src/main/java/com/alttd/frameSpawners/FrameSpawnerPlayer.java
index 9949e08..3c253b9 100644
--- a/src/main/java/com/alttd/frameSpawners/FrameSpawnerPlayer.java
+++ b/src/main/java/com/alttd/frameSpawners/FrameSpawnerPlayer.java
@@ -42,7 +42,7 @@ public class FrameSpawnerPlayer extends BukkitRunnable {
             return;
         }
         ParticleSet activeParticleSet = playerSettings.getParticles(aPartType);
-        if (activeParticleSet == null || !activeParticleSet.getParticleId().equalsIgnoreCase(uniqueId)) {
+        if (activeParticleSet == null || !activeParticleSet.getParticleId().equalsIgnoreCase(uniqueId) || playerSettings.hasActiveParticles()) {
             this.cancel();
             if (Config.DEBUG)
                 Logger.info("Stopped repeating task due to player switching/disabling particles.");