diff --git a/src/baseq2/p_weapon.c b/src/baseq2/p_weapon.c
index 14ee173..61e825e 100644
--- a/src/baseq2/p_weapon.c
+++ b/src/baseq2/p_weapon.c
@@ -224,6 +224,11 @@ void NoAmmoWeaponChange(edict_t *ent){
 		ent->client->newweapon = FindItem("hyperblaster");
 		return;
 	}
+	if ( ent->client->pers.inventory[ITEM_INDEX(FindItem("rockets"))]
+			&&  ent->client->pers.inventory[ITEM_INDEX(FindItem("rocket launcher"))]){
+		ent->client->newweapon = FindItem ("rocket launcher");
+		return;
+	}
 	if( ent->client->pers.inventory[ITEM_INDEX(FindItem("bullets"))]
 			&& ent->client->pers.inventory[ITEM_INDEX(FindItem("chaingun"))]){
 		ent->client->newweapon = FindItem("chaingun");
diff --git a/src/ctf/p_weapon.c b/src/ctf/p_weapon.c
index f0b8783..445e55f 100644
--- a/src/ctf/p_weapon.c
+++ b/src/ctf/p_weapon.c
@@ -224,6 +224,11 @@ void NoAmmoWeaponChange(edict_t *ent){
 		ent->client->newweapon = FindItem("hyperblaster");
 		return;
 	}
+	if ( ent->client->pers.inventory[ITEM_INDEX(FindItem("rockets"))]
+			&&  ent->client->pers.inventory[ITEM_INDEX(FindItem("rocket launcher"))]){
+		ent->client->newweapon = FindItem ("rocket launcher");
+		return;
+	}
 	if( ent->client->pers.inventory[ITEM_INDEX(FindItem("bullets"))]
 			&& ent->client->pers.inventory[ITEM_INDEX(FindItem("chaingun"))]){
 		ent->client->newweapon = FindItem("chaingun");