diff --git a/engine/code/cgame/cg_draw.c b/engine/code/cgame/cg_draw.c
index d80c9c63..5c82708a 100644
--- a/engine/code/cgame/cg_draw.c
+++ b/engine/code/cgame/cg_draw.c
@@ -2903,7 +2903,7 @@ static void CG_DrawAmmoWarning( void ) {
 	int			w;
 
 // Q3Rally Code Start
-	if (isRallyNonDMRace()){
+	if (isRallyNonDMRace() || cgs.gametype == GT_DERBY){
 		return;
 	}
 // Q3Rally Code END
diff --git a/engine/code/cgame/cg_playerstate.c b/engine/code/cgame/cg_playerstate.c
index 58a65182..06c17128 100644
--- a/engine/code/cgame/cg_playerstate.c
+++ b/engine/code/cgame/cg_playerstate.c
@@ -36,6 +36,14 @@ void CG_CheckAmmo( void ) {
 	int		previous;
 	int		weapons;
 
+// Q3Rally Code Start
+	if ( cg.snap->ps.weapon == WP_NONE ||
+		 cg.snap->ps.weapon == WP_GAUNTLET ) {
+		cg.lowAmmoWarning = 0;
+		return;
+	}
+// Q3Rally Code END
+
 	// see about how many seconds of ammo we have remaining
 	weapons = cg.snap->ps.stats[ STAT_WEAPONS ];
 	total = 0;