diff --git a/Source/Client/HUD.c b/Source/Client/HUD.c
index 6471c37d..035ac47f 100644
--- a/Source/Client/HUD.c
+++ b/Source/Client/HUD.c
@@ -229,6 +229,10 @@ Draws the current clip, the amount of ammo for the caliber and a matching calibe
 =================
 */
 void HUD_DrawAmmo( void ) {
+	if ( getstatf( STAT_ACTIVEWEAPON ) == WEAPON_KNIFE || getstatf( STAT_ACTIVEWEAPON ) == WEAPON_C4BOMB ) {
+		return;
+	}
+	
 	vector vAmmoClipPos = [ vVideoResolution_x - 136, vVideoResolution_y - 42 ];
 	HUD_DrawNums( getstatf( STAT_CURRENT_CLIP ), vAmmoClipPos );
 	vector vAmmoCalPos = [ vVideoResolution_x - 64, vVideoResolution_y - 42 ];
diff --git a/Source/Shared/WeaponC4Bomb.c b/Source/Shared/WeaponC4Bomb.c
index 337e1bfd..7e5431be 100644
--- a/Source/Shared/WeaponC4Bomb.c
+++ b/Source/Shared/WeaponC4Bomb.c
@@ -104,6 +104,7 @@ void WeaponC4BOMB_PrimaryFire( void ) {
 	if ( trace_fraction == 1 || self.fInBombZone == FALSE ) {
 		WeaponC4BOMB_Release();
 		self.fAttackFinished = time + 1.0;
+		return;
 	}
 	
 	// Play the sequence at the start