diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2fde9c..95a70fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -68,6 +68,7 @@
 - pdr: Remove PDR if the contained entity to be removed is the last one
 - meson: sizes.h: add includedir to install path
 - pdr: Create entity association PDRs with unique record handle
+- requester: add null check for instance db object in pldm_instance_id_alloc()
 
 ### Security
 
diff --git a/src/requester/instance-id.c b/src/requester/instance-id.c
index d891a48..10dc276 100644
--- a/src/requester/instance-id.c
+++ b/src/requester/instance-id.c
@@ -122,7 +122,7 @@
 {
 	uint8_t l_iid;
 
-	if (!iid) {
+	if (!ctx || !iid) {
 		return -EINVAL;
 	}
 
diff --git a/tests/instance-id.cpp b/tests/instance-id.cpp
index ad290ac..ed94c59 100644
--- a/tests/instance-id.cpp
+++ b/tests/instance-id.cpp
@@ -86,6 +86,14 @@
     EXPECT_EQ(pldm_instance_db_destroy(db), 0);
 }
 
+TEST_F(PldmInstanceDbTest, allocOnNulldb)
+{
+    struct pldm_instance_db* db = nullptr;
+    const pldm_tid_t tid = 1;
+    pldm_instance_id_t iid;
+    EXPECT_EQ(pldm_instance_id_alloc(db, tid, &iid), -EINVAL);
+}
+
 TEST_F(PldmInstanceDbTest, allocFreeOne)
 {
     struct pldm_instance_db* db = nullptr;