diff --git a/src/gamelogic/cgame/cg_weapons.c b/src/gamelogic/cgame/cg_weapons.c
index 537826eec3d..bb780ec9d5c 100644
--- a/src/gamelogic/cgame/cg_weapons.c
+++ b/src/gamelogic/cgame/cg_weapons.c
@@ -1740,6 +1740,7 @@ void CG_AddViewWeapon( playerState_t *ps )
 	weaponInfo_t *wi;
 	weapon_t     weapon = ps->weapon;
 	weaponMode_t weaponMode = ps->generic1;
+	qboolean     drawGun = qtrue;
 
 	// no weapon carried - can't draw it
 	if ( weapon == WP_NONE )
@@ -1754,6 +1755,21 @@ void CG_AddViewWeapon( playerState_t *ps )
 
 	wi = &cg_weapons[ weapon ];
 
+	switch ( cg_drawGun.integer )
+	{
+		case 0:
+			drawGun = qfalse;
+			break;
+
+		case 1:
+			if ( BG_Weapon( weapon )->team == TEAM_ALIENS )
+			{
+				drawGun = qfalse;
+			}
+			break;
+	}
+			
+
 	if ( !wi->registered )
 	{
 		Com_Printf( _( S_COLOR_YELLOW  "WARNING: CG_AddViewWeapon: weapon %d (%s) "
@@ -1786,7 +1802,7 @@ void CG_AddViewWeapon( playerState_t *ps )
 	}
 
 	// allow the gun to be completely removed
-	if ( !cg_drawGun.integer )
+	if ( !drawGun )
 	{
 		vec3_t origin;