diff --git a/rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/custom_event_info.hpp b/rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/custom_event_info.hpp
index 5dab33d5e..a45d2ec99 100644
--- a/rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/custom_event_info.hpp
+++ b/rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/custom_event_info.hpp
@@ -70,11 +70,11 @@ class EventListenerInterface
   virtual void update_inconsistent_topic(uint32_t total_count, uint32_t total_count_change) = 0;
 
 protected:
-  eprosima::fastdds::dds::GuardCondition event_guard[RMW_EVENT_INVALID];
+  eprosima::fastdds::dds::GuardCondition event_guard[RMW_EVENT_TYPE_MAX];
 
-  rmw_event_callback_t on_new_event_cb_[RMW_EVENT_INVALID] = {nullptr};
+  rmw_event_callback_t on_new_event_cb_[RMW_EVENT_TYPE_MAX] = {nullptr};
 
-  const void * user_data_[RMW_EVENT_INVALID] = {nullptr};
+  const void * user_data_[RMW_EVENT_TYPE_MAX] = {nullptr};
 
   std::mutex on_new_event_m_;