diff --git a/src/transport/transport.c b/src/transport/transport.c
index e800ef9..ee94091 100644
--- a/src/transport/transport.c
+++ b/src/transport/transport.c
@@ -214,7 +214,9 @@
 		if (rc == PLDM_REQUESTER_SUCCESS) {
 			const struct pldm_msg_hdr *resp_hdr = *pldm_resp_msg;
 			if ((src_tid == tid) &&
-			    (req_hdr->instance_id == resp_hdr->instance_id)) {
+			    (req_hdr->instance_id == resp_hdr->instance_id) &&
+			    (req_hdr->type == resp_hdr->type) &&
+			    (req_hdr->command == resp_hdr->command)) {
 				return rc;
 			}