diff --git a/db/db_impl/db_impl.cc b/db/db_impl/db_impl.cc
index 630f5e881..b43dfe23d 100644
--- a/db/db_impl/db_impl.cc
+++ b/db/db_impl/db_impl.cc
@@ -1324,11 +1324,7 @@ Status DBImpl::MarkLogsSynced(uint64_t up_to, bool synced_dir) {
     assert(wal.getting_synced);
     if (logs_.size() > 1) {
       if (immutable_db_options_.track_and_verify_wals_in_manifest &&
-          wal.writer->file()->GetFileSize() > 0 &&
-          wal.number >= versions_->GetWalSet().GetMinWalNumberToKeep()) {
-        // wal.number might < min_wal_number_to_keep when
-        // the WAL becomes obsolete after flushing, but not deleted from disk
-        // yet, then SyncWAL is called.
+          wal.writer->file()->GetFileSize() > 0) {
         synced_wals.AddWal(wal.number,
                            WalMetadata(wal.writer->file()->GetFileSize()));
       }
diff --git a/db/memtable_list.cc b/db/memtable_list.cc
index ae072d9aa..e6d3b929e 100644
--- a/db/memtable_list.cc
+++ b/db/memtable_list.cc
@@ -488,13 +488,9 @@ Status MemTableList::TryInstallMemtableFlushResults(
 
       std::unique_ptr<VersionEdit> wal_deletion;
       if (vset->db_options()->track_and_verify_wals_in_manifest) {
-        vset->SetMinWalNumberToKeepInWalSet(min_wal_number_to_keep);
-        const auto& wals = vset->GetWalSet().GetWals();
-        if (!wals.empty() && min_wal_number_to_keep > wals.begin()->first) {
-          wal_deletion.reset(new VersionEdit);
-          wal_deletion->DeleteWalsBefore(min_wal_number_to_keep);
-          edit_list.push_back(wal_deletion.get());
-        }
+        wal_deletion.reset(new VersionEdit);
+        wal_deletion->DeleteWalsBefore(min_wal_number_to_keep);
+        edit_list.push_back(wal_deletion.get());
       }
 
       const auto manifest_write_cb = [this, cfd, batch_count, log_buffer,
@@ -758,14 +754,10 @@ Status InstallMemtableAtomicFlushResults(
       min_wal_number_to_keep =
           PrecomputeMinLogNumberToKeepNon2PC(vset, cfds, edit_lists);
     }
-    vset->SetMinWalNumberToKeepInWalSet(min_wal_number_to_keep);
-    const auto& wals = vset->GetWalSet().GetWals();
-    if (!wals.empty() && min_wal_number_to_keep > wals.begin()->first) {
-      wal_deletion.reset(new VersionEdit);
-      wal_deletion->DeleteWalsBefore(min_wal_number_to_keep);
-      edit_lists.back().push_back(wal_deletion.get());
-      ++num_entries;
-    }
+    wal_deletion.reset(new VersionEdit);
+    wal_deletion->DeleteWalsBefore(min_wal_number_to_keep);
+    edit_lists.back().push_back(wal_deletion.get());
+    ++num_entries;
   }
 
   // Mark the version edits as an atomic group if the number of version edits
diff --git a/db/version_set.h b/db/version_set.h
index ed83fb198..685d4348e 100644
--- a/db/version_set.h
+++ b/db/version_set.h
@@ -1229,11 +1229,6 @@ class VersionSet {
   // The returned WalSet needs to be accessed with DB mutex held.
   const WalSet& GetWalSet() const { return wals_; }
 
-  // Must be called with DB mutex held.
-  void SetMinWalNumberToKeepInWalSet(WalNumber number) {
-    return wals_.SetMinWalNumberToKeep(number);
-  }
-
   void TEST_CreateAndAppendVersion(ColumnFamilyData* cfd) {
     assert(cfd);
 
diff --git a/db/wal_edit.cc b/db/wal_edit.cc
index e300738e4..786d68b5c 100644
--- a/db/wal_edit.cc
+++ b/db/wal_edit.cc
@@ -106,10 +106,8 @@ std::string WalDeletion::DebugString() const {
 
 Status WalSet::AddWal(const WalAddition& wal) {
   if (wal.GetLogNumber() < min_wal_number_to_keep_) {
-    std::stringstream ss;
-    ss << "min_wal_number_to_keep is " << min_wal_number_to_keep_ << ", so WAL "
-       << wal.GetLogNumber() << " is obsolete";
-    return Status::Corruption("WalSet::AddWal", ss.str());
+    // The WAL has been obsolete, ignore it.
+    return Status::OK();
   }
 
   auto it = wals_.lower_bound(wal.GetLogNumber());
@@ -149,7 +147,10 @@ Status WalSet::AddWals(const WalAdditions& wals) {
 }
 
 Status WalSet::DeleteWalsBefore(WalNumber wal) {
-  wals_.erase(wals_.begin(), wals_.lower_bound(wal));
+  if (wal > min_wal_number_to_keep_) {
+    min_wal_number_to_keep_ = wal;
+    wals_.erase(wals_.begin(), wals_.lower_bound(wal));
+  }
   return Status::OK();
 }
 
diff --git a/db/wal_edit.h b/db/wal_edit.h
index 567a209ad..7e1f9a576 100644
--- a/db/wal_edit.h
+++ b/db/wal_edit.h
@@ -143,10 +143,6 @@ class WalSet {
 
   // WALs with number less than MinWalNumberToKeep should not exist in WalSet.
   WalNumber GetMinWalNumberToKeep() const { return min_wal_number_to_keep_; }
-  // If number < MinWalNumberToKeep, then it's a no-op.
-  void SetMinWalNumberToKeep(WalNumber number) {
-    min_wal_number_to_keep_ = std::max(min_wal_number_to_keep_, number);
-  }
 
   const std::map<WalNumber, WalMetadata>& GetWals() const { return wals_; }
 
diff --git a/db/wal_edit_test.cc b/db/wal_edit_test.cc
index c5e6e773a..5895e180d 100644
--- a/db/wal_edit_test.cc
+++ b/db/wal_edit_test.cc
@@ -85,20 +85,19 @@ TEST(WalSet, AddObsoleteWal) {
   constexpr WalNumber kNumber = 100;
   WalSet wals;
   ASSERT_OK(wals.DeleteWalsBefore(kNumber + 1));
-  Status s = wals.AddWal(WalAddition(kNumber));
-  ASSERT_TRUE(s.IsCorruption());
-  ASSERT_TRUE(s.ToString().find("WAL 100 is obsolete") != std::string::npos);
+  ASSERT_OK(wals.AddWal(WalAddition(kNumber)));
+  ASSERT_TRUE(wals.GetWals().empty());
 }
 
 TEST(WalSet, MinWalNumberToKeep) {
   constexpr WalNumber kNumber = 100;
   WalSet wals;
   ASSERT_EQ(wals.GetMinWalNumberToKeep(), 0);
-  wals.SetMinWalNumberToKeep(kNumber);
+  ASSERT_OK(wals.DeleteWalsBefore(kNumber));
   ASSERT_EQ(wals.GetMinWalNumberToKeep(), kNumber);
-  wals.SetMinWalNumberToKeep(kNumber - 1);
+  ASSERT_OK(wals.DeleteWalsBefore(kNumber - 1));
   ASSERT_EQ(wals.GetMinWalNumberToKeep(), kNumber);
-  wals.SetMinWalNumberToKeep(kNumber + 1);
+  ASSERT_OK(wals.DeleteWalsBefore(kNumber + 1));
   ASSERT_EQ(wals.GetMinWalNumberToKeep(), kNumber + 1);
 }