diff --git a/omaha_request_action.cc b/omaha_request_action.cc
index 8967762..8f405e8 100644
--- a/omaha_request_action.cc
+++ b/omaha_request_action.cc
@@ -123,20 +123,25 @@
       // generated with a previous version of 0.0.0.0 -- this is relevant for
       // older clients or new installs. The previous version event is not sent
       // for ping-only requests because they come before the client has
-      // rebooted.
+      // rebooted. The previous version event is also not sent if it was already
+      // sent for this new version with a previous updatecheck.
       string prev_version;
       if (!prefs->GetString(kPrefsPreviousVersion, &prev_version)) {
         prev_version = "0.0.0.0";
       }
-
-      app_body += base::StringPrintf(
-          "        <event eventtype=\"%d\" eventresult=\"%d\" "
-          "previousversion=\"%s\"></event>\n",
-          OmahaEvent::kTypeUpdateComplete,
-          OmahaEvent::kResultSuccessReboot,
-          XmlEncodeWithDefault(prev_version, "0.0.0.0").c_str());
-      LOG_IF(WARNING, !prefs->SetString(kPrefsPreviousVersion, ""))
-          << "Unable to reset the previous version.";
+      // We only store a non-empty previous version value after a successful
+      // update in the previous boot. After reporting it back to the server,
+      // we clear the previous version value so it doesn't get reported again.
+      if (!prev_version.empty()) {
+        app_body += base::StringPrintf(
+            "        <event eventtype=\"%d\" eventresult=\"%d\" "
+            "previousversion=\"%s\"></event>\n",
+            OmahaEvent::kTypeUpdateComplete,
+            OmahaEvent::kResultSuccessReboot,
+            XmlEncodeWithDefault(prev_version, "0.0.0.0").c_str());
+        LOG_IF(WARNING, !prefs->SetString(kPrefsPreviousVersion, ""))
+            << "Unable to reset the previous version.";
+      }
     }
   } else {
     // The error code is an optional attribute so append it only if the result
diff --git a/update_attempter.cc b/update_attempter.cc
index 1610ec4..09dd108 100644
--- a/update_attempter.cc
+++ b/update_attempter.cc
@@ -1083,6 +1083,12 @@
       // Notify the PayloadState that the successful payload was canceled.
       system_state_->payload_state()->ResetUpdateStatus();
 
+      // The previous version is used to report back to omaha after reboot that
+      // we actually rebooted into the new version from this "prev-version". We
+      // need to clear out this value now to prevent it being sent on the next
+      // updatecheck request.
+      ret_value = prefs_->SetString(kPrefsPreviousVersion, "") && ret_value;
+
       LOG(INFO) << "Reset status " << (ret_value ? "successful" : "failed");
       return ret_value;
     }