Johnson's division spent the next seven months of the siege in the trenches. In late March 1865, Johnson's division was withdrawn from the trench line to meet the Union drive around the Confederate right flank, and fought at Lewis's Farm on March 29. On March 31, Johnson led them in a counterattack at White Oak Road. They drove back two Union divisions, but were halted and driven back themselves by Union reinforcements. Two brigades of the division were detached to Pickett at Five Forks, and largely destroyed in that battle on April 1. Johnson led the rest of the division in the retreat toward Appomattox. At Sailor's Creek on April 6, the division was shattered, although Johnson escaped capture. Lee relieved Johnson of command on April 8. He accompanied the army without a command until the surrender at Appomattox Court House, when he was paroled.