Changed the way we handle the devices to avoid duplicated pushes