diff --git a/osd_cluster.cpp b/osd_cluster.cpp
index 8b5bf441..2a155c54 100644
--- a/osd_cluster.cpp
+++ b/osd_cluster.cpp
@@ -223,8 +223,11 @@ void osd_t::on_change_osd_state_hook(osd_num_t peer_osd)
 void osd_t::on_change_etcd_state_hook(json11::Json::object & changes)
 {
     // FIXME apply config changes in runtime (maybe, some)
-    apply_pg_count();
-    apply_pg_config();
+    if (run_primary && !(peering_state & OSD_LOADING_PGS))
+    {
+        apply_pg_count();
+        apply_pg_config();
+    }
 }
 
 void osd_t::on_change_pg_history_hook(pool_id_t pool_id, pg_num_t pg_num)