diff --git a/client/ios_handler/in_process_handler.cc b/client/ios_handler/in_process_handler.cc
index 67987348..6058e3b3 100644
--- a/client/ios_handler/in_process_handler.cc
+++ b/client/ios_handler/in_process_handler.cc
@@ -201,6 +201,12 @@ void InProcessHandler::SaveSnapshot(
   }
   process_snapshot.SetReportID(new_report->ReportID());
 
+  UUID client_id;
+  Settings* const settings = database_->GetSettings();
+  if (settings && settings->GetClientID(&client_id)) {
+    process_snapshot.SetClientID(client_id);
+  }
+
   MinidumpFileWriter minidump;
   minidump.InitializeFromSnapshot(&process_snapshot);
   if (!minidump.WriteEverything(new_report->Writer())) {
diff --git a/snapshot/ios/process_snapshot_ios_intermediate_dump.cc b/snapshot/ios/process_snapshot_ios_intermediate_dump.cc
index bf973a3a..9a63ea1d 100644
--- a/snapshot/ios/process_snapshot_ios_intermediate_dump.cc
+++ b/snapshot/ios/process_snapshot_ios_intermediate_dump.cc
@@ -52,6 +52,7 @@ bool ProcessSnapshotIOSIntermediateDump::InitializeWithFileInterface(
   INITIALIZATION_STATE_SET_INITIALIZING(initialized_);
 
   annotations_simple_map_ = annotations;
+  client_id_.InitializeToZero();
 
   IOSIntermediateDumpReaderInitializeResult result =
       reader_.Initialize(dump_interface);