diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java
index 842a2d267..d0c1bb5b0 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java
@@ -362,6 +362,7 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
 
 	public void add( State state ) {
 		synchronized (State.class) {
+			stateRemovals.remove(state);
 			stateAdditions.add(state);
 		}
 	}
@@ -460,6 +461,7 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
 
 	public void remove( State state ) {
 		synchronized (State.class) {
+			stateAdditions.remove(state);
 			stateRemovals.add(state);
 		}
 	}