diff --git a/events.asm b/events.asm
index d5ebb20..7c59d37 100644
--- a/events.asm
+++ b/events.asm
@@ -137,11 +137,6 @@ OnNewFile:
 			DEX : DEX
 		BPL -
 
-        LDX #$000E : -
-            LDA $7EF37C, X : STA $7EF4E0, X
-            DEX : DEX
-        BPL -
-
 		LDX #$000E : -
 			LDA $7EF37C, X : STA $7EF4E0, X
 			DEX : DEX
diff --git a/newhud.asm b/newhud.asm
index 9c36f2d..f7b7993 100644
--- a/newhud.asm
+++ b/newhud.asm
@@ -8,13 +8,20 @@ SEP #$30
 
 	LDA !INFINITE_BOMBS : BNE .infinite_bombs
 	.finite_bombs
+		LDA.l SpecialWeapons : CMP #$01 : BNE .normal
+		LDA.l !BOMB_LEVEL : BEQ .no_bombs
+	.normal
 		LDA.l $7EF343 ; bombs
 		JSR HudHexToDec2Digit ;requires 8 bit registers!
 		REP #$20
 		LDX.b $06 : TXA : ORA.w #$2400 : STA !BOMBCOUNT_DRAW_ADDRESS ; Draw bombs 10 digit
 		LDX.b $07 : TXA : ORA.w #$2400 : STA !BOMBCOUNT_DRAW_ADDRESS+2 ; Draw bombs 1 digit
 		BRA +
-
+	.no_bombs
+		REP #$20
+		LDA.w #$207F : STA !BOMBCOUNT_DRAW_ADDRESS ; blank
+		STA !BOMBCOUNT_DRAW_ADDRESS+2 ; blank
+		BRA +
 	.infinite_bombs
 		REP #$20
 		LDA.w #$2431 : STA !BOMBCOUNT_DRAW_ADDRESS ; infinity (left half)