diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/AttackIndicator.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/AttackIndicator.java
index 7d8d9d8dc..13b8c2d01 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/AttackIndicator.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/AttackIndicator.java
@@ -122,7 +122,7 @@ public class AttackIndicator extends Tag {
 			}
 		}
 		
-		if (!candidates.contains( lastTarget )) {
+		if (lastTarget == null || !candidates.contains( lastTarget )) {
 			if (candidates.isEmpty()) {
 				lastTarget = null;
 			} else {
@@ -132,8 +132,8 @@ public class AttackIndicator extends Tag {
 				flash();
 			}
 		} else {
+			active = true;
 			if (!bg.visible) {
-				active = true;
 				flash();
 			}
 		}