diff --git a/README.md b/README.md
index 0adad42c..284ed808 100644
--- a/README.md
+++ b/README.md
@@ -280,7 +280,7 @@
 * Max ammo no longer fills clip ammo
 * Upgraded: kill on any round
 * Upgraded: charged shots damage Panzersoldat
-* Upgraded: decreased alt weapon reload time to 0.5 seconds
+* Upgraded: decreased alt weapon reload time to 0.4 seconds
 * Fire upgraded: charged shots no longer deal additional damage to Panzersoldat
 * Ice upgraded: fixed melee sound
 
diff --git a/scripts/zm/replaced/_zm_weap_staff_revive.gsc b/scripts/zm/replaced/_zm_weap_staff_revive.gsc
index 600e133d..18830bb4 100644
--- a/scripts/zm/replaced/_zm_weap_staff_revive.gsc
+++ b/scripts/zm/replaced/_zm_weap_staff_revive.gsc
@@ -34,7 +34,7 @@ staff_revive_reload( str_weapon )
 {
     self endon( "disconnect" );
 
-    wait weaponFireTime(str_weapon) - 0.05;
+    wait 0.4;
 
     ammo_clip = self getWeaponAmmoClip(str_weapon);
     ammo_stock = self getWeaponAmmoStock(str_weapon);
@@ -43,5 +43,25 @@ staff_revive_reload( str_weapon )
     {
         self setWeaponAmmoClip(str_weapon, ammo_clip + 1);
         self setWeaponAmmoStock(str_weapon, ammo_stock - 1);
+        return;
+    }
+
+    while (1)
+    {
+        self waittill( "weapon_change" );
+
+        if (self getCurrentWeapon() == str_weapon)
+        {
+            ammo_clip = self getWeaponAmmoClip(str_weapon);
+            ammo_stock = self getWeaponAmmoStock(str_weapon);
+
+            if (ammo_clip < 1 && ammo_stock >= 1)
+            {
+                self setWeaponAmmoClip(str_weapon, ammo_clip + 1);
+                self setWeaponAmmoStock(str_weapon, ammo_stock - 1);
+            }
+
+            return;
+        }
     }
 }
\ No newline at end of file