Yes, diagnosing and treating underlying issues like major depression, panic disorder, PTSD, and bipolar disorder is the only way to end the negative cycle. Mental health issues trigger substance use, which in turn triggers mental health issues (and so on).