Residents east of Gavilan Road and south of Esperanza Drive, west of Piedras and north of Idaleona Road had been ordered to evacuate early Monday afternoon.
Officials say about 24 homes were evacuated.
The fire was first reported at 1:33 p.m. near Gavilan Road and Bonita Drive, with firefighters describing it as five acres but "burning at a rapid rate."
By around 4 p.m. it had spread to 20 acres, but firefighters said they had managed to stop its forward spread.
By around 5 p.m., the evacuation orders had been lifted.
RELATED | What to prepare in case of a wildfire evacuation
Aircraft, dozers and hand crews were dispatched to the scene.
One firefighter incurred injuries which were described as not life-threatening.
The blaze was named the Chico Fire. Chico Drive is in the area where the fire originated.