diff --git a/src/battle/player.c b/src/battle/player.c
index 8c9d63e..89344f1 100644
--- a/src/battle/player.c
+++ b/src/battle/player.c
@@ -549,7 +549,7 @@ static void switchGuns(void)
 
 	i = player->selectedGunType;
 
-	if (!player->combinedGuns)
+	if (!player->combinedGuns && battle.numPlayerGuns)
 	{
 		do
 		{