diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java
index 94e44e9de..45af9fd18 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java
@@ -120,7 +120,7 @@ public class Berserk extends Buff {
 
 		}
 
-		return state == State.BERSERK && target.SHLD > 0;
+		return state == State.BERSERK;
 	}
 
 	public void recover(float percent){
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
index a4d5fb170..130216bac 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
@@ -1403,7 +1403,8 @@ public class Hero extends Char {
 	public boolean isAlive() {
 		if (subClass == HeroSubClass.BERSERKER
 				&& berserk != null
-				&& berserk.berserking()){
+				&& berserk.berserking()
+				&& SHLD > 0){
 			return true;
 		}
 		return super.isAlive();