diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BossHealthBar.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BossHealthBar.java
index 95b267273..bb40c0a59 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BossHealthBar.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BossHealthBar.java
@@ -157,8 +157,12 @@ public class BossHealthBar extends Component {
 			if (!boss.isAlive() || !Dungeon.level.mobs.contains(boss)){
 				boss = null;
 				visible = active = false;
-				buffs.killAndErase();
-				buffs = null;
+				if (buffs != null) {
+					BuffIndicator.setBossInstance(null);
+					remove(buffs);
+					buffs.destroy();
+					buffs = null;
+				}
 			} else {
 
 				int health = boss.HP;
@@ -197,7 +201,8 @@ public class BossHealthBar extends Component {
 			instance.visible = instance.active = true;
 			if (boss != null){
 				if (instance.buffs != null){
-					instance.buffs.killAndErase();
+					instance.remove(instance.buffs);
+					instance.buffs.destroy();
 				}
 				instance.buffs = new BuffIndicator(boss, false);
 				BuffIndicator.setBossInstance(instance.buffs);