Fix state handling in new sink