diff --git a/services/std_svc/spm/el3_spmc/spmc_shared_mem.c b/services/std_svc/spm/el3_spmc/spmc_shared_mem.c
index 8183a0a..6863d00 100644
--- a/services/std_svc/spm/el3_spmc/spmc_shared_mem.c
+++ b/services/std_svc/spm/el3_spmc/spmc_shared_mem.c
@@ -854,6 +854,14 @@
 			return FFA_ERROR_INVALID_PARAMETER;
 		}
 
+		/* Ensure the composite descriptor offset is aligned. */
+		if (!is_aligned(comp_mrd_offset, 16)) {
+			WARN("%s: invalid object, unaligned composite memory "
+			     "region descriptor offset %u.\n",
+			     __func__, comp_mrd_offset);
+			return FFA_ERROR_INVALID_PARAMETER;
+		}
+
 		size = obj->desc_size;
 
 		if (offset > size) {
@@ -874,11 +882,6 @@
 
 		comp = spmc_shmem_obj_get_comp_mrd(obj, ffa_version);
 
-		if (comp == NULL) {
-			WARN("%s: invalid comp_mrd offset\n", __func__);
-			return FFA_ERROR_INVALID_PARAMETER;
-		}
-
 		if (comp->address_range_count != count) {
 			WARN("%s: invalid object, desc count %u != %zu\n",
 			     __func__, comp->address_range_count, count);