After making amends with the photographer he allegedly assaulted, Rob Kardashian's battery and theft charges were dropped on Thursday (June 6).

Back in March, photographer Andra Viak took photos of the shirtless reality star, causing him to snag her camera's memory card.

In addition to criminal charges, Viak sued the 26-year-old sock designer in civil court. That lawsuit was settled with Rob agreeing to pay for her camera equipment.

Inside the courtroom, over the prosecutor's objection, the judge dismissed the criminal charges after considering the settlement agreement in the civil case.