diff --git a/buffet/device_registration_info.cc b/buffet/device_registration_info.cc
index eec9985..136513d 100644
--- a/buffet/device_registration_info.cc
+++ b/buffet/device_registration_info.cc
@@ -767,6 +767,8 @@
   config_->set_description(description);
   config_->set_location(location);
 
+  Save();
+
   OnConfigChanged();
 
   if (HaveRegistrationCredentials(nullptr)) {
diff --git a/buffet/device_registration_info_unittest.cc b/buffet/device_registration_info_unittest.cc
index 6e3feb2..ee230ab 100644
--- a/buffet/device_registration_info_unittest.cc
+++ b/buffet/device_registration_info_unittest.cc
@@ -470,8 +470,7 @@
   std::string device_id = dev_reg_->RegisterDevice(params, nullptr);
 
   EXPECT_EQ(test_data::kDeviceId, device_id);
-  EXPECT_EQ(1,
-            storage_->save_count());  // The device info must have been saved.
+  EXPECT_GT(storage_->save_count(), 1);  // The state must have been saved.
   EXPECT_EQ(3, transport_->GetRequestCount());
   EXPECT_EQ(RegistrationStatus::kConnecting, dev_reg_->GetRegistrationStatus());