Temporary fix for null disconnect