Index: src/game/bg_pmove.c
===================================================================
--- src/game/bg_pmove.c	(revision 789)
+++ src/game/bg_pmove.c	(working copy)
@@ -2782,6 +2782,7 @@
   {
     PM_AddEvent( EV_NOAMMO );
     pm->ps->weaponTime += 200;
+    if(pm->ps->weaponstate == WEAPON_FIRING) pm->ps->weaponstate = WEAPON_READY;
     return;
   }