diff --git a/Tactical/Overhead.cpp b/Tactical/Overhead.cpp
index 4021a070e..3f4244bd6 100644
--- a/Tactical/Overhead.cpp
+++ b/Tactical/Overhead.cpp
@@ -9625,7 +9625,7 @@ SOLDIERTYPE *InternalReduceAttackBusyCount( )
             fEnterCombat = FALSE;
         }
 
-        if ( pSoldier->flags.fSayAmmoQuotePending && ( Chance( gGameExternalOptions.iChanceSayAnnoyingPhrase ) || GetMagSize( &pSoldier->inv[pSoldier->ubAttackingHand] ) > 4 ) )
+		if (pSoldier->flags.fSayAmmoQuotePending)
         {
             pSoldier->flags.fSayAmmoQuotePending = FALSE;
             TacticalCharacterDialogue( pSoldier, QUOTE_OUT_OF_AMMO );
diff --git a/Tactical/Weapons.cpp b/Tactical/Weapons.cpp
index 46da42210..5c13734d1 100644
--- a/Tactical/Weapons.cpp
+++ b/Tactical/Weapons.cpp
@@ -2657,12 +2657,12 @@ BOOLEAN UseGunNCTH( SOLDIERTYPE *pSoldier , INT32 sTargetGridNo )
 		DeductAmmo( pSoldier, pSoldier->ubAttackingHand );
 
 		// ATE: Check if we should say quote...
-		if ( (*pObjHand)[0]->data.gun.ubGunShotsLeft == 0 && !Item[usUBItem].rocketlauncher )
+		if ( (*pObjHand)[0]->data.gun.ubGunShotsLeft == 0 && 
+			!Item[usUBItem].rocketlauncher &&
+			pSoldier->bTeam == gbPlayerNum &&
+			(Chance(gGameExternalOptions.iChanceSayAnnoyingPhrase) || GetMagSize(pObjHand) > 4))
 		{
-			if ( pSoldier->bTeam == gbPlayerNum )
-			{
-				pSoldier->flags.fSayAmmoQuotePending = TRUE;
-			}
+			pSoldier->flags.fSayAmmoQuotePending = TRUE;
 		}
 	}
 	else	//  throwing knife
@@ -3419,12 +3419,12 @@ BOOLEAN UseGun( SOLDIERTYPE *pSoldier , INT32 sTargetGridNo )
 		DeductAmmo( pSoldier, pSoldier->ubAttackingHand );
 
 		// ATE: Check if we should say quote...		
-		if ( (*pObjUsed)[0]->data.gun.ubGunShotsLeft == 0 && !Item[usUBItem].rocketlauncher )
+		if ( (*pObjUsed)[0]->data.gun.ubGunShotsLeft == 0 && 
+			!Item[usUBItem].rocketlauncher &&
+			pSoldier->bTeam == gbPlayerNum &&
+			(Chance(gGameExternalOptions.iChanceSayAnnoyingPhrase) || GetMagSize(pObjUsed) > 4))
 		{
-			if ( pSoldier->bTeam == gbPlayerNum )
-			{
-				pSoldier->flags.fSayAmmoQuotePending = TRUE;
-			}
+			pSoldier->flags.fSayAmmoQuotePending = TRUE;
 		}
 		// NB bDoBurst will be 2 at this point for the first shot since it was incremented
 		// above