diff --git a/pw_kvs/key_value_store.cc b/pw_kvs/key_value_store.cc
index 617eb6b..07ff99a 100644
--- a/pw_kvs/key_value_store.cc
+++ b/pw_kvs/key_value_store.cc
@@ -587,8 +587,8 @@
   // Look for a partial sector to use with enough space. Immediately use the
   // first one of those that is found. While scanning for a partial sector, keep
   // track of the first empty sector and if a second sector was seen.
-  for (size_t i = start; i != last_new_sector_index_;
-       i = (i + 1) % sector_map_size_) {
+  for (size_t j = 0; j < sector_map_size_; j++) {
+    size_t i = (j + start) % sector_map_size_;
     SectorDescriptor& sector = sector_map_[i];
 
     if (sector_to_skip == &sector) {
@@ -639,7 +639,9 @@
     return result;
   }
   if (options_.partial_gc_on_write) {
-    return GarbageCollectOneSector(sector);
+    // Garbage collect and then try again to find the best sector.
+    TRY(GarbageCollectOneSector());
+    return FindSectorWithSpace(sector, size);
   }
   return result;
 }
@@ -676,7 +678,7 @@
   return sector_candidate;
 }
 
-Status KeyValueStore::GarbageCollectOneSector(SectorDescriptor** sector) {
+Status KeyValueStore::GarbageCollectOneSector() {
   DBG("Garbage Collect a single sector");
 
   // Step 1: Find the sector to garbage collect
@@ -709,7 +711,6 @@
   sector_to_gc->tail_free_bytes = partition_.sector_size_bytes();
 
   DBG("  Garbage Collect complete");
-  *sector = sector_to_gc;
   return Status::OK;
 }
 
diff --git a/pw_kvs/public/pw_kvs/key_value_store.h b/pw_kvs/public/pw_kvs/key_value_store.h
index 792682a..886c81d 100644
--- a/pw_kvs/public/pw_kvs/key_value_store.h
+++ b/pw_kvs/public/pw_kvs/key_value_store.h
@@ -311,7 +311,7 @@
 
   Status FindOrRecoverSectorWithSpace(SectorDescriptor** sector, size_t size);
 
-  Status GarbageCollectOneSector(SectorDescriptor** sector);
+  Status GarbageCollectOneSector();
 
   SectorDescriptor* FindSectorToGarbageCollect();