diff --git a/include/zenoh-pico/api/primitives.h b/include/zenoh-pico/api/primitives.h
index fee0150ed..0ad1a5d6a 100644
--- a/include/zenoh-pico/api/primitives.h
+++ b/include/zenoh-pico/api/primitives.h
@@ -1707,6 +1707,7 @@ const z_loaned_sample_t *z_reply_ok(const z_loaned_reply_t *reply);
  */
 const z_loaned_reply_err_t *z_reply_err(const z_loaned_reply_t *reply);
 
+#ifdef Z_FEATURE_UNSTABLE_API
 /**
  * Gets the id of the zenoh instance that answered this Reply.
  *
@@ -1717,7 +1718,9 @@ const z_loaned_reply_err_t *z_reply_err(const z_loaned_reply_t *reply);
  * 	 `true` if id is present
  */
 bool z_reply_replier_id(const z_loaned_reply_t *reply, z_id_t *out_id);
-#endif
+#endif  // Z_FEATURE_UNSTABLE_API
+
+#endif  // Z_FEATURE_QUERY == 1
 
 #if Z_FEATURE_QUERYABLE == 1
 /**
diff --git a/src/api/api.c b/src/api/api.c
index 712d5e35b..c76a9b32e 100644
--- a/src/api/api.c
+++ b/src/api/api.c
@@ -1087,6 +1087,7 @@ const z_loaned_sample_t *z_reply_ok(const z_loaned_reply_t *reply) { return &rep
 
 const z_loaned_reply_err_t *z_reply_err(const z_loaned_reply_t *reply) { return &reply->data._result.error; }
 
+#ifdef Z_FEATURE_UNSTABLE_API
 bool z_reply_replier_id(const z_loaned_reply_t *reply, z_id_t *out_id) {
     if (_z_id_check(reply->data.replier_id)) {
         *out_id = reply->data.replier_id;
@@ -1094,7 +1095,9 @@ bool z_reply_replier_id(const z_loaned_reply_t *reply, z_id_t *out_id) {
     }
     return false;
 }
-#endif
+#endif  // Z_FEATURE_UNSTABLE_API
+
+#endif  // Z_FEATURE_QUERY == 1
 
 #if Z_FEATURE_QUERYABLE == 1
 _Z_OWNED_FUNCTIONS_RC_IMPL(query)