Chris Brown will reportedly stick around the rehab center in Malibu where he has spent the past three months.
CNN reports that the R&B singer has been ordered to stay in the facility for another two months.
Brown has been receiving treatment for anger management and is also involved in a drug rehab program.
The star is believed to be improving, having already “stabilized” his severe insomnia.
That said, Brown is still facing an assault charge from his arrest in Washington, D.C. last fall, and the outcome of that case could still send him back to prison for violating his probation.
TMZ alleges that along with the insomnia, he has been treated for Bipolar II Disorder and Post-Traumatic Stress Disorder while in the rehab facility.
Over the course of his three-month stint, the facility has given Brown high marks for his “exemplary” work in completing his community service requirements.
According to CNN, the judge will make a further judgment on his future on April 23, after his assault trial goes forward the week before.