diff --git a/src/placement/pl_map_common.c b/src/placement/pl_map_common.c
index 53039baccf7..d3bded29027 100644
--- a/src/placement/pl_map_common.c
+++ b/src/placement/pl_map_common.c
@@ -251,7 +251,8 @@ is_comp_avaible(struct pool_component *comp, uint32_t allow_version,
 			status = PO_COMP_ST_UPIN;
 		} else if (status == PO_COMP_ST_UP) {
 			if (comp->co_flags & PO_COMPF_DOWN2UP) {
-				status = PO_COMP_ST_UPIN;
+				/* does not work for delay_rebuild mode */
+				/* status = PO_COMP_ST_UPIN; */
 			} else {
 				if (comp->co_fseq <= 1)
 					status = PO_COMP_ST_NEW;
@@ -392,6 +393,7 @@ determine_valid_spares(struct pool_target *spare_tgt, struct daos_obj_md *md,
 		 */
 		if (f_shard->fs_status == PO_COMP_ST_DOWN ||
 		    f_shard->fs_status == PO_COMP_ST_DRAIN ||
+		    f_shard->fs_status == PO_COMP_ST_UP ||
 		    pool_target_down(spare_tgt))
 			l_shard->po_rebuilding = 1;
 	} else {