Chris Brown will be extending his residency at a Malibu treatment facility. The R&B superstar has been sent back to rehab for two more months.

Brown appeared in an L.A. courtroom on Friday for a progress report update in the Rihanna assault case. Los Angeles County Judge James Brandlin ordered him to remain in the anger management and drug rehab program he entered three months ago, reports CNN.

Brown’s probation officer said that the 24-year-old singer “continues to make great improvement” in dealing with anger, stress, and drugs. However, the judge decided that he can’t go free yet and must first be tried on his assault charge in Washington, D.C.

After the April 23 hearing, the judge will decide whether Brown should go to jail for violating his probation in the Rihanna assault case.

Brown, who was joined in court by his mother, appeared disappointed by the decision. He closed his eyes and seemed to meditate while his lawyer, Mark Geragos, met with the judge and prosecutor.

According to court documents (via TMZ), Brown’s anger issues were triggered by bipolar disorder, severe insomnia, and Post Traumatic Stress Disorder.

“Never really goes the way u plan. #LIFE,” tweeted Brown following his court appearance.

He is scheduled to remain in rehab until April 23. It’s unclear how this will impact his album X, which is slated for a May 5 release.