Changes State to never store Metric instance.
Fixes inherited Application (like CMS tool) not working correctly because of a bad query.