diff --git a/libpldm/firmware_update.c b/libpldm/firmware_update.c
index 1aa0ed1..023fc4f 100644
--- a/libpldm/firmware_update.c
+++ b/libpldm/firmware_update.c
@@ -782,9 +782,6 @@
 
 	struct pldm_component_parameter_entry *entry =
 	    (struct pldm_component_parameter_entry *)(data);
-	if (entry->active_comp_ver_str_len == 0) {
-		return PLDM_ERROR_INVALID_LENGTH;
-	}
 
 	size_t entry_length = sizeof(struct pldm_component_parameter_entry) +
 			      entry->active_comp_ver_str_len +
@@ -822,9 +819,14 @@
 	component_data->capabilities_during_update.value =
 	    le32toh(entry->capabilities_during_update.value);
 
-	active_comp_ver_str->ptr =
-	    data + sizeof(struct pldm_component_parameter_entry);
-	active_comp_ver_str->length = entry->active_comp_ver_str_len;
+	if (entry->active_comp_ver_str_len != 0) {
+		active_comp_ver_str->ptr =
+		    data + sizeof(struct pldm_component_parameter_entry);
+		active_comp_ver_str->length = entry->active_comp_ver_str_len;
+	} else {
+		active_comp_ver_str->ptr = NULL;
+		active_comp_ver_str->length = 0;
+	}
 
 	if (entry->pending_comp_ver_str_len != 0) {