diff --git a/rmw_zenoh_cpp/src/rmw_zenoh.cpp b/rmw_zenoh_cpp/src/rmw_zenoh.cpp
index dfd90d35..a378e8bb 100644
--- a/rmw_zenoh_cpp/src/rmw_zenoh.cpp
+++ b/rmw_zenoh_cpp/src/rmw_zenoh.cpp
@@ -2393,15 +2393,7 @@ rmw_take_request(
     return RMW_RET_ERROR;
   }
   const z_query_t z_loaned_query = z_query_loan(owned_query_ptr);
-
-  // TODO(francocipollone): Fix this.
-  //                        We are getting a segmentation fault here at z_query_value call.
-  //                        (Replicable at the zenoh-c examples.)
-  #if false
   z_value_t payload_value = z_query_value(&z_loaned_query);
-  #else
-  z_value_t payload_value = z_value_t{}; // dummy value while this is not fixed.
-  #endif
 
   // Object that manages the raw buffer
   eprosima::fastcdr::FastBuffer fastbuffer(