diff --git a/src/privet/cloud_delegate.cc b/src/privet/cloud_delegate.cc
index fddc8e1..d612668 100644
--- a/src/privet/cloud_delegate.cc
+++ b/src/privet/cloud_delegate.cc
@@ -134,7 +134,9 @@
   }
 
   std::string GetCloudId() const override {
-    return device_->GetSettings().cloud_id;
+    return connection_state_.status() > ConnectionState::kUnconfigured
+               ? device_->GetSettings().cloud_id
+               : "";
   }
 
   const base::DictionaryValue& GetState() const override { return state_; }