diff --git a/src/p_spec.c b/src/p_spec.c
index 7063b6dc5..deb197a6e 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -1920,7 +1920,7 @@ static void K_HandleLapIncrement(player_t *player)
 			}
 
 			if (skins[player->skin].flags & SF_IRONMAN)
-				SetRandomFakePlayerSkin(player);
+				SetRandomFakePlayerSkin(player, true);
 
 			if (rainbowstartavailable == true)
 			{
diff --git a/src/p_user.c b/src/p_user.c
index 8d07207ed..24317d014 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -4175,10 +4175,9 @@ void P_PlayerThink(player_t *player)
 			{
 				SetFakePlayerSkin(player, player->fakeskin);
 			}
-			else
+			else if (!(gametyperules & GTR_CIRCUIT))
 			{
-				// "Don't halfass" - Oni
-				// SetRandomFakePlayerSkin(player, false);
+				SetRandomFakePlayerSkin(player, false);
 			}
 		}
 	}