Fix issue with clearing subscriptions on disconnect