diff --git a/src/p_mobj.c b/src/p_mobj.c
index a978b9446..1fda781c6 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -13095,7 +13095,7 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj)
 	{
 		if (nummapspraycans == UINT8_MAX
 		|| modeattacking != ATTACKING_NONE
-		|| tutorialchallenge == TUTORIALSKIP_INPROGRESS)
+		|| (tutorialchallenge == TUTORIALSKIP_INPROGRESS && gamedata->gotspraycans == 0))
 		{
 			P_RemoveMobj(mobj);
 			return false;
diff --git a/src/p_setup.cpp b/src/p_setup.cpp
index e50e17830..9618b1370 100644
--- a/src/p_setup.cpp
+++ b/src/p_setup.cpp
@@ -881,7 +881,8 @@ static void P_SpawnMapThings(boolean spawnemblems)
 
 	if (spawnemblems
 		&& gametype != GT_TUTORIAL
-		&& !modeattacking)
+		&& !modeattacking
+		&& !(tutorialchallenge == TUTORIALSKIP_INPROGRESS && gamedata->gotspraycans == 0))
 	{
 		const UINT8 recommendedcans =
 #ifdef DEVELOP