diff --git a/components/p3a/message_manager.cc b/components/p3a/message_manager.cc
index 6e10aac33df..6ba6795cd59 100644
--- a/components/p3a/message_manager.cc
+++ b/components/p3a/message_manager.cc
@@ -136,10 +136,10 @@ void MessageManager::Stop() {
 
 void MessageManager::RemoveObsoleteLogs() {
   for (MetricLogType log_type : kAllMetricLogTypes) {
-    if (json_log_stores_.contains(log_type)) {
+    if (json_log_stores_[log_type]) {
       json_log_stores_[log_type]->RemoveObsoleteLogs();
     }
-    if (constellation_prep_log_stores_.contains(log_type)) {
+    if (constellation_prep_log_stores_[log_type]) {
       constellation_prep_log_stores_[log_type]->RemoveObsoleteLogs();
     }
   }
diff --git a/components/p3a/p3a_service.cc b/components/p3a/p3a_service.cc
index 7590ecfc89d..2be78599a8b 100644
--- a/components/p3a/p3a_service.cc
+++ b/components/p3a/p3a_service.cc
@@ -210,10 +210,6 @@ void P3AService::Init(
   }
 #endif
 
-  if (local_state_->GetBoolean(kP3AEnabled)) {
-    message_manager_->Start(url_loader_factory_);
-  }
-
   initialized_ = true;
 
   // Store values that were recorded between calling constructor and |Init()|.
@@ -221,6 +217,10 @@ void P3AService::Init(
     HandleHistogramChange(std::string(entry.first), entry.second);
   }
   histogram_values_.clear();
+
+  if (local_state_->GetBoolean(kP3AEnabled)) {
+    message_manager_->Start(url_loader_factory_);
+  }
 }
 
 void P3AService::OnRotation(MetricLogType log_type, bool is_constellation) {