diff --git a/include/zenoh-pico/api/primitives.h b/include/zenoh-pico/api/primitives.h
index ce9f733bc..dba962539 100644
--- a/include/zenoh-pico/api/primitives.h
+++ b/include/zenoh-pico/api/primitives.h
@@ -2060,6 +2060,7 @@ z_result_t z_declare_background_subscriber(const z_loaned_session_t *zs, const z
 const z_loaned_keyexpr_t *z_subscriber_keyexpr(const z_loaned_subscriber_t *subscriber);
 #endif
 
+#ifdef Z_FEATURE_UNSTABLE_API 
 #if Z_FEATURE_BATCHING == 1
 /**
  * Activate the batching mechanism.
@@ -2085,6 +2086,7 @@ z_result_t zp_batch_start(const z_loaned_session_t *zs);
  */
 z_result_t zp_batch_stop(const z_loaned_session_t *zs);
 #endif
+#endif
 
 /************* Multi Thread Tasks helpers **************/
 /**
diff --git a/src/api/api.c b/src/api/api.c
index 4e6eadc53..37b2e0037 100644
--- a/src/api/api.c
+++ b/src/api/api.c
@@ -1420,6 +1420,7 @@ const z_loaned_keyexpr_t *z_subscriber_keyexpr(const z_loaned_subscriber_t *sub)
 }
 #endif
 
+#ifdef Z_FEATURE_UNSTABLE_API
 #if Z_FEATURE_BATCHING == 1
 z_result_t zp_batch_start(const z_loaned_session_t *zs) {
     if (_Z_RC_IS_NULL(zs)) {
@@ -1439,6 +1440,7 @@ z_result_t zp_batch_stop(const z_loaned_session_t *zs) {
     return _z_send_n_batch(session, Z_CONGESTION_CONTROL_DEFAULT);
 }
 #endif
+#endif
 
 /**************** Tasks ****************/
 void zp_task_read_options_default(zp_task_read_options_t *options) {