diff --git a/sharing/internal/test/fake_connectivity_manager.h b/sharing/internal/test/fake_connectivity_manager.h
index 47135cdb..18a33de7 100644
--- a/sharing/internal/test/fake_connectivity_manager.h
+++ b/sharing/internal/test/fake_connectivity_manager.h
@@ -15,6 +15,7 @@
 #ifndef THIRD_PARTY_NEARBY_SHARING_INTERNAL_TEST_FAKE_CONNECTIVITY_MANAGER_H_
 #define THIRD_PARTY_NEARBY_SHARING_INTERNAL_TEST_FAKE_CONNECTIVITY_MANAGER_H_
 
+#include <atomic>
 #include <functional>
 #include <string>
 #include <utility>
@@ -52,21 +53,21 @@ class FakeConnectivityManager : public ConnectivityManager {
   void SetLanConnected(bool connected) {
     is_lan_connected_ = connected;
     for (auto& listener : lan_listeners_) {
-      listener.second(is_lan_connected_);
+      listener.second(connected);
     }
   }
 
   void SetInternetConnected(bool connected) {
     is_internet_connected_ = connected;
     for (auto& listener : internet_listeners_) {
-      listener.second(is_internet_connected_);
+      listener.second(connected);
     }
   }
 
  private:
-  bool is_lan_connected_ = true;
-  bool is_internet_connected_ = true;
-  bool is_hp_realtek_device_ = false;
+  std::atomic<bool> is_lan_connected_ = true;
+  std::atomic<bool> is_internet_connected_ = true;
+  std::atomic<bool> is_hp_realtek_device_ = false;
   absl::flat_hash_map<std::string, std::function<void(bool)>> lan_listeners_;
   absl::flat_hash_map<std::string, std::function<void(bool)>>
       internet_listeners_;
diff --git a/sharing/nearby_sharing_service_impl.cc b/sharing/nearby_sharing_service_impl.cc
index ac3ed1f5..f8a8a96e 100644
--- a/sharing/nearby_sharing_service_impl.cc
+++ b/sharing/nearby_sharing_service_impl.cc
@@ -412,8 +412,8 @@ void NearbySharingServiceImpl::SendInitialAdapterState(
 
 void NearbySharingServiceImpl::AddObserver(
     NearbySharingService::Observer* observer) {
-  SendInitialAdapterState(observer);
   service_observers_.AddObserver(observer);
+  SendInitialAdapterState(observer);
 }
 
 void NearbySharingServiceImpl::RemoveObserver(