diff --git a/src/shared/att.c b/src/shared/att.c
index ee425d8..3181b36 100644
--- a/src/shared/att.c
+++ b/src/shared/att.c
@@ -666,8 +666,10 @@ struct notify_data {
 
 static bool opcode_match(uint8_t opcode, uint8_t test_opcode)
 {
-	if (opcode == BT_ATT_ALL_REQUESTS &&
-				    get_op_type(test_opcode) == ATT_OP_TYPE_REQ)
+	enum att_op_type op_type = get_op_type(test_opcode);
+
+	if (opcode == BT_ATT_ALL_REQUESTS && (op_type == ATT_OP_TYPE_REQ ||
+						op_type == ATT_OP_TYPE_CMD))
 		return true;
 
 	return opcode == test_opcode;