Fixing --° freeze bug when a device did not have state