Merge pull request #12423 from crosbymichael/idkbutitworks

Ensure state is destroyed on daemont restart