diff --git a/payload_state.cc b/payload_state.cc
index c519b4f..f7c75da 100644
--- a/payload_state.cc
+++ b/payload_state.cc
@@ -1090,6 +1090,11 @@
 }
 
 void PayloadState::UpdateEngineStarted() {
+  // Avoid the UpdateEngineStarted actions if this is not the first time we
+  // run the update engine since reboot.
+  if (!system_state_->system_rebooted())
+    return;
+
   // Figure out if we just booted into a new update
   if (prefs_->Exists(kPrefsSystemUpdatedMarker)) {
     int64_t stored_value;
diff --git a/payload_state_unittest.cc b/payload_state_unittest.cc
index 5a8722f..eb66628 100644
--- a/payload_state_unittest.cc
+++ b/payload_state_unittest.cc
@@ -1017,6 +1017,8 @@
   EXPECT_CALL(*mock_system_state.mock_metrics_lib(), SendToUMA(
       "Installer.TimeToRebootMinutes",
       7, _, _, _));
+  EXPECT_CALL(mock_system_state, system_rebooted())
+      .WillRepeatedly(Return(true));
 
   payload_state2.UpdateEngineStarted();
 
@@ -1026,6 +1028,33 @@
   EXPECT_TRUE(utils::RecursiveUnlinkDir(temp_dir));
 }
 
+TEST(PayloadStateTest, RestartAfterCrash) {
+  PayloadState payload_state;
+  MockSystemState mock_system_state;
+  NiceMock<PrefsMock>* prefs = mock_system_state.mock_prefs();
+
+  EXPECT_TRUE(payload_state.Initialize(&mock_system_state));
+
+  // No prefs should be used after a crash.
+  EXPECT_CALL(*prefs, Exists(_)).Times(0);
+  EXPECT_CALL(*prefs, SetString(_, _)).Times(0);
+  EXPECT_CALL(*prefs, SetInt64(_, _)).Times(0);
+  EXPECT_CALL(*prefs, SetBoolean(_, _)).Times(0);
+  EXPECT_CALL(*prefs, GetString(_, _)).Times(0);
+  EXPECT_CALL(*prefs, GetInt64(_, _)).Times(0);
+  EXPECT_CALL(*prefs, GetBoolean(_, _)).Times(0);
+
+  // No metrics are reported after a crash.
+  EXPECT_CALL(*mock_system_state.mock_metrics_lib(),
+              SendToUMA(_, _, _, _, _)).Times(0);
+
+  // Simulate an update_engine restart without a reboot.
+  EXPECT_CALL(mock_system_state, system_rebooted())
+      .WillRepeatedly(Return(false));
+
+  payload_state.UpdateEngineStarted();
+}
+
 TEST(PayloadStateTest, CandidateUrlsComputedCorrectly) {
   OmahaResponse response;
   MockSystemState mock_system_state;