diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/GreatCrab.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/GreatCrab.java
index 3e4702156..dc7473d13 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/GreatCrab.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/GreatCrab.java
@@ -70,6 +70,7 @@ public class GreatCrab extends Crab {
 
 	@Override
 	public void damage( int dmg, Object src ){
+		if (enemy == null) enemy = chooseEnemy();
 		//crab blocks all wand damage from the hero if it sees them.
 		//Direct damage is negated, but add-on effects and environmental effects go through as normal.
 		if (enemySeen
@@ -88,6 +89,7 @@ public class GreatCrab extends Crab {
 
 	@Override
 	public int defenseSkill( Char enemy ) {
+		if (this.enemy == null) this.enemy = chooseEnemy();
 		//crab blocks all melee attacks from its current target
 		if (enemySeen
 				&& state != SLEEPING