diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg
index 5e36ea2e..a68e2b8b 100644
--- a/config/menus_settings.cfg
+++ b/config/menus_settings.cfg
@@ -293,6 +293,7 @@ newmenu gameplay
 
 menuitemtextinput "Nickname:			 " "result $curname" "name $arg1"
 menuitemslider "Player skins: " 0 2 "$teamdisplaymode" 1 [Normal "Colored vests" "Full color"] "teamdisplaymode $arg1"
+menuitemslider "Custom player skins: " 0 2 "$hidecustomskins" 1 [always "non-team modes" never] "hidecustomskins $arg1"
 menuitem "" -1
 menuitemcheckbox "Auto weapon reload: " "$autoreload" "autoreload $arg1"
 menuitem "Change to the enemy team" "changeteam"
diff --git a/source/src/rendermodel.cpp b/source/src/rendermodel.cpp
index 92f39cf1..dd423e51 100644
--- a/source/src/rendermodel.cpp
+++ b/source/src/rendermodel.cpp
@@ -652,7 +652,7 @@ void renderclient(playerent *d, const char *mdlname, const char *vwepname, int t
 VARP(teamdisplaymode, 0, 1, 2);
 
 #define SKINBASE "packages/models/playermodels"
-VARP(hidecustomskins, 0, 0, 1);
+VARP(hidecustomskins, 0, 0, 2);
 static cvector playerskinlist;
 
 const char *getclientskin(const char *name, const char *suf)
@@ -696,7 +696,7 @@ void renderclient(playerent *d)
     int team = team_int(d->team);
     int skinid = 1 + max(0, min(d->skin, (team==TEAM_CLA ? 3 : 5)));
     string skin;
-    if(!hidecustomskins)
+    if(hidecustomskins == 0 || (hidecustomskins == 1 && !m_teammode))
     {
         cs = team ? d->skin_rvsf : d->skin_cla;
         if(!m_teammode && d->skin_noteam) cs = d->skin_noteam;