diff --git a/capacityupgrades.asm b/capacityupgrades.asm
index 59e4693..cdd343f 100644
--- a/capacityupgrades.asm
+++ b/capacityupgrades.asm
@@ -6,7 +6,8 @@
 ;--------------------------------------------------------------------------------
 IncrementBombs:
     LDA !BOMB_UPGRADES ; get bomb upgrades
-	!ADD.l StartingMaxBombs : DEC
+	!ADD.l StartingMaxBombs : BEQ + ; Skip if we can't have bombs
+	DEC
 
     CMP !BOMB_CURRENT
 	
diff --git a/inventory.asm b/inventory.asm
index c3b42dc..aa27b73 100644
--- a/inventory.asm
+++ b/inventory.asm
@@ -740,6 +740,7 @@ RTS
 Link_ReceiveItem_HUDRefresh:
 	LDA $7EF343 : BNE + ; skip if we have bombs
 	LDA $7EF375 : BEQ + ; skip if we are filling no bombs
+	LDA $7EF370 : !ADD.l StartingMaxBombs : BEQ + ; skip if we can't have bombs
 		DEC : STA $7EF375 ; decrease bomb fill count
 		LDA.b #$01 : STA $7EF343 ; increase actual bomb count
 	+
@@ -755,6 +756,7 @@ RTL
 HandleBombAbsorbtion:
 	STA $7EF375 ; thing we wrote over
 	LDA $0303 : BNE + ; skip if we already have some item selected
+	LDA $7EF370 : !ADD.l StartingMaxBombs : BEQ + ; skip if we can't have bombs
 		LDA.b #$04 : STA $0202 ; set selected item to bombs
 		LDA.b #$01 : STA $0303 ; set selected item to bombs
 		JSL.l HUD_RebuildLong