Fix duplicate state subscriptions