diff --git a/buffet/privet/cloud_delegate.cc b/buffet/privet/cloud_delegate.cc
index 83c7bbb..7c9adc5 100644
--- a/buffet/privet/cloud_delegate.cc
+++ b/buffet/privet/cloud_delegate.cc
@@ -319,7 +319,8 @@
   void CallManagerRegisterDevice(const std::string& ticket_id, int retries) {
     chromeos::ErrorPtr error;
     if (device_->RegisterDevice(ticket_id, &error).empty())
-      RetryRegister(ticket_id, retries, error.get());
+      return RetryRegister(ticket_id, retries, error.get());
+    setup_state_ = SetupState(SetupState::kSuccess);
   }
 
   buffet::CommandInstance* GetCommandInternal(const std::string& command_id,