diff --git a/src/p_mobj.c b/src/p_mobj.c
index 2596fe0fc..965652ea8 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -13083,7 +13083,9 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj)
 	}
 	case MT_SPRAYCAN:
 	{
-		if (nummapspraycans == UINT8_MAX || tutorialchallenge == TUTORIALSKIP_INPROGRESS)
+		if (nummapspraycans == UINT8_MAX
+		|| modeattacking != ATTACKING_NONE
+		|| tutorialchallenge == TUTORIALSKIP_INPROGRESS)
 		{
 			P_RemoveMobj(mobj);
 			return false;