diff --git a/src/game/shared/swarm/asw_weapon_flamer_shared.cpp b/src/game/shared/swarm/asw_weapon_flamer_shared.cpp
index 0ad02d2b5..b75ab3d8f 100644
--- a/src/game/shared/swarm/asw_weapon_flamer_shared.cpp
+++ b/src/game/shared/swarm/asw_weapon_flamer_shared.cpp
@@ -407,6 +407,7 @@ void CASW_Weapon_Flamer::SecondaryAttack( void )
 		{
 			// decrement ammo
 			m_iClip1 -= 2;
+			NotifyIfNoneClip1Ammo( pMarine );
 		}
 	}
 	if (!rd_flamer_infinite_extinguisher.GetBool() || m_iClip1 > 0)		// only force the fire wait time if we have ammo for another shot
diff --git a/src/game/shared/swarm/asw_weapon_tesla_gun_shared.cpp b/src/game/shared/swarm/asw_weapon_tesla_gun_shared.cpp
index 37f1871a4..f37cdb98f 100644
--- a/src/game/shared/swarm/asw_weapon_tesla_gun_shared.cpp
+++ b/src/game/shared/swarm/asw_weapon_tesla_gun_shared.cpp
@@ -200,6 +200,7 @@ void CASW_Weapon_Tesla_Gun::PrimaryAttack( void )
 			{
 				m_iClip1 = MAX( 0, m_iClip1 - 1 );
 				m_flLastDischargeTime = gpGlobals->curtime;
+				NotifyIfNoneClip1Ammo( pMarine );
 			}
 
 			m_flNextPrimaryAttack = gpGlobals->curtime;
@@ -325,6 +326,7 @@ void CASW_Weapon_Tesla_Gun::ShockEntity()
 
 	// decrement ammo
 	m_iClip1 = MAX( 0, m_iClip1 - 1 );
+	NotifyIfNoneClip1Ammo( pMarine );
 
 	CPASFilter filter( pShockBaseEntity->GetAbsOrigin() );
 	CBaseEntity::EmitSound( filter, SOUND_FROM_WORLD, "ASW_Tesla_Laser.Damage", &pShockBaseEntity->GetAbsOrigin() );
@@ -489,8 +491,6 @@ void CASW_Weapon_Tesla_Gun::Fire( const Vector &vecOrigSrc, const Vector &vecDir
 		SetFiringState( ASW_TG_FIRE_DISCHARGE );
 	}
 
-	NotifyIfNoneClip1Ammo( pMarine );
-
 	if ( tr.DidHit() )
 	{
 		vecDest = tr.endpos;