diff --git a/.githubmap b/.githubmap
index 3f7a252fe96..1c8c3a9876e 100644
--- a/.githubmap
+++ b/.githubmap
@@ -208,3 +208,4 @@ aainscow Alex Ainscow <aainscow@uk.ibm.com>
 Hezko Tomer Haskalovitch <tomer.haska@ibm.com>
 aainscow Alex Ainscow <aainscow@uk.ibm.com>
 caroav Aviv.Caro@ibm.com
+aainscow bcAlex Ainscow <aainscow@uk.ibm.com>
diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc
index fcb2fb35972..d53bc3d0ad3 100644
--- a/src/osd/PeeringState.cc
+++ b/src/osd/PeeringState.cc
@@ -2892,6 +2892,10 @@ void PeeringState::activate(
   send_notify = false;
 
   if (is_primary()) {
+    // Update the epoch so that pwlc used by the primary during
+    // peering becomes the definitive copy of pwlc
+    info.partial_writes_last_complete_epoch = get_osdmap_epoch();
+
     // only update primary last_epoch_started if we will go active
     if (acting_set_writeable()) {
       ceph_assert(cct->_conf->osd_find_best_info_ignore_history_les ||
@@ -3347,9 +3351,6 @@ void PeeringState::consider_rollback_pwlc(eversion_t last_complete)
 		 << info.partial_writes_last_complete[shard] << dendl;
     }
   }
-  // Update the epoch so that pwlc adjustments made by the whole
-  // proc_master_log process are recognized as the newest updates
-  info.partial_writes_last_complete_epoch = get_osdmap_epoch();
 }
 
 void PeeringState::proc_master_log(