diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5138dd..d357b6c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -172,6 +172,7 @@
 15. dsp: bios: Bounds check encode_set_bios_table_req()
 16. dsp: bios: Bounds check encode_set_bios_attribute_current_value_req()
 17. dsp: bios_table: Bounds check pldm_bios_table_string_entry_encode()
+18. dsp: pdr: Rework test in pldm_entity_association_pdr_extract()
 
 ## [0.9.1] - 2024-09-07
 
diff --git a/src/dsp/pdr.c b/src/dsp/pdr.c
index 3a132a3..ccaa929 100644
--- a/src/dsp/pdr.c
+++ b/src/dsp/pdr.c
@@ -1341,17 +1341,13 @@
 	if (entity_association_pdr->num_children == UINT8_MAX) {
 		return;
 	}
+
 	size_t l_num_entities = entity_association_pdr->num_children + 1;
 	if (l_num_entities < 2) {
 		return;
 	}
 
-	if (SIZE_MAX / sizeof(pldm_entity) < l_num_entities) {
-		return;
-	}
-
-	if (pdr_len - sizeof(*entity_association_pdr) + 1 <
-	    sizeof(pldm_entity) * l_num_entities) {
+	if (UINT8_MAX < l_num_entities) {
 		return;
 	}