diff --git a/rmw_cyclonedds_cpp/src/rmw_node.cpp b/rmw_cyclonedds_cpp/src/rmw_node.cpp
index 075dff5a..67b03d97 100644
--- a/rmw_cyclonedds_cpp/src/rmw_node.cpp
+++ b/rmw_cyclonedds_cpp/src/rmw_node.cpp
@@ -4492,6 +4492,7 @@ extern "C" rmw_ret_t rmw_wait(
         if (ws->trigs[trig_idx] == static_cast<dds_attach_t>(nelems)) {
           bool dummy;
           dds_take_guardcondition(x->gcondh, &dummy);
+          trig_idx++;
         } else {
           gcs->guard_conditions[i] = nullptr;
         }