diff --git a/db/version_set.cc b/db/version_set.cc
index 65ae1becb7dcadc79677aa0be547ef39490e22ac..ca1e96dbd6095808db9e3fc9728c4215e22c9b0b 100644
--- a/db/version_set.cc
+++ b/db/version_set.cc
@@ -985,7 +985,8 @@ Status VersionSet::LogAndApply(VersionEdit* edit, port::Mutex* mu,
   Status s;
 
   //  No need to perform this check if a new Manifest is being created anyways.
-  if (last_observed_manifest_size_ > options_->max_manifest_file_size) {
+  if (!descriptor_log_ ||
+      last_observed_manifest_size_ > options_->max_manifest_file_size) {
     new_descriptor_log = true;
     manifest_file_number_ = NewFileNumber(); // Change manifest file no.
   }