diff --git a/src/client/cl_ents.c b/src/client/cl_ents.c
index 1c1cd026..95bb55fe 100644
--- a/src/client/cl_ents.c
+++ b/src/client/cl_ents.c
@@ -1163,7 +1163,8 @@ void CL_AddViewWeapon (player_state_t *ps, player_state_t *ops)
 
 	// don't draw gun if in wide angle view
 	if (ps->fov > 90)
-		return;
+		if (cl_gun->value < 2)
+			return;
 
 	if (gun_model)
 		gun.model = gun_model;	// development tool
diff --git a/src/client/cl_main.c b/src/client/cl_main.c
index 57c46e00..2322278f 100644
--- a/src/client/cl_main.c
+++ b/src/client/cl_main.c
@@ -1430,7 +1430,7 @@ void CL_InitLocal (void)
 	cl_add_lights = Cvar_Get ("cl_lights", "1", 0);
 	cl_add_particles = Cvar_Get ("cl_particles", "1", 0);
 	cl_add_entities = Cvar_Get ("cl_entities", "1", 0);
-	cl_gun = Cvar_Get ("cl_gun", "1", 0);
+	cl_gun = Cvar_Get ("cl_gun", "2", CVAR_ARCHIVE);
 	cl_footsteps = Cvar_Get ("cl_footsteps", "1", 0);
 	cl_noskins = Cvar_Get ("cl_noskins", "0", 0);
 	cl_autoskins = Cvar_Get ("cl_autoskins", "0", 0);