diff --git a/src/st_stuff.c b/src/st_stuff.c
index b0cb85ae..810ce603 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -1215,16 +1215,15 @@ void ST_createWidgets(void)
                 ST_AMMOX - distributed_delta,
                 ST_AMMOY,
                 tallnum,
-                &plyr->ammo[weaponinfo[plyr->readyweapon].ammo],
+                weaponinfo[plyr->readyweapon].ammo != am_noammo ?
+                &plyr->ammo[weaponinfo[plyr->readyweapon].ammo] :
+                &largeammo,
                 &st_statusbaron,
                 ST_AMMOWIDTH );
 
   // the last weapon type
   w_ready.data = plyr->readyweapon;
 
-  if (weaponinfo[plyr->readyweapon].ammo == am_noammo)
-    w_ready.num = &largeammo;
-
   // health percentage
   STlib_initPercent(&w_health,
                     ST_HEALTHX - distributed_delta,