diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22760432f..e35bf455d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -241,7 +241,7 @@ set(Z_FEATURE_UNICAST_TRANSPORT 1 CACHE STRING "Toggle unicast transport")
 set(Z_FEATURE_RAWETH_TRANSPORT 0 CACHE STRING "Toggle raw ethernet transport")
 set(Z_FEATURE_TCP_NODELAY 1 CACHE STRING "Toggle TCP_NODELAY")
 set(Z_FEATURE_LOCAL_SUBSCRIBER 0 CACHE STRING "Toggle local subscriptions")
-set(Z_FEATURE_PUBLISHER_SESSION_CHECK 1 CACHE STRING "Toggle publisher session check")
+set(Z_FEATURE_SESSION_CHECK 1 CACHE STRING "Toggle publisher/querier session check")
 set(Z_FEATURE_BATCHING 1 CACHE STRING "Toggle batching")
 set(Z_FEATURE_MATCHING 1 CACHE STRING "Toggle matching feature")
 set(Z_FEATURE_RX_CACHE 0 CACHE STRING "Toggle RX_CACHE")
diff --git a/src/api/api.c b/src/api/api.c
index dbcfa5d1f..3c9bacefe 100644
--- a/src/api/api.c
+++ b/src/api/api.c
@@ -1020,7 +1020,7 @@ z_result_t z_publisher_put(const z_loaned_publisher_t *pub, z_moved_bytes_t *pay
     _z_keyexpr_t pub_keyexpr = _z_keyexpr_alias_from_user_defined(pub->_key, true);
 
     _z_session_t *session = NULL;
-#if Z_FEATURE_PUBLISHER_SESSION_CHECK == 1
+#if Z_FEATURE_SESSION_CHECK == 1
     // Try to upgrade session rc
     _z_session_rc_t sess_rc = _z_session_weak_upgrade_if_open(&pub->_zn);
     if (!_Z_RC_IS_NULL(&sess_rc)) {
@@ -1054,7 +1054,7 @@ z_result_t z_publisher_put(const z_loaned_publisher_t *pub, z_moved_bytes_t *pay
         ret = _Z_ERR_SESSION_CLOSED;
     }
 
-#if Z_FEATURE_PUBLISHER_SESSION_CHECK == 1
+#if Z_FEATURE_SESSION_CHECK == 1
     _z_session_rc_drop(&sess_rc);
 #endif
 
@@ -1080,7 +1080,7 @@ z_result_t z_publisher_delete(const z_loaned_publisher_t *pub, const z_publisher
     _z_keyexpr_t pub_keyexpr = _z_keyexpr_alias_from_user_defined(pub->_key, true);
 
     _z_session_t *session = NULL;
-#if Z_FEATURE_PUBLISHER_SESSION_CHECK == 1
+#if Z_FEATURE_SESSION_CHECK == 1
     // Try to upgrade session rc
     _z_session_rc_t sess_rc = _z_session_weak_upgrade_if_open(&pub->_zn);
     if (!_Z_RC_IS_NULL(&sess_rc)) {
@@ -1096,7 +1096,7 @@ z_result_t z_publisher_delete(const z_loaned_publisher_t *pub, const z_publisher
         _z_write(session, pub_keyexpr, _z_bytes_null(), NULL, Z_SAMPLE_KIND_DELETE, pub->_congestion_control,
                  pub->_priority, pub->_is_express, opt.timestamp, _z_bytes_null(), reliability);
 
-#if Z_FEATURE_PUBLISHER_SESSION_CHECK == 1
+#if Z_FEATURE_SESSION_CHECK == 1
     // Clean up
     _z_session_rc_drop(&sess_rc);
 #endif
@@ -1288,6 +1288,7 @@ z_result_t z_querier_get(const z_loaned_querier_t *querier, const char *paramete
     _z_keyexpr_t querier_keyexpr = _z_keyexpr_alias_from_user_defined(querier->_key, true);
 
     _z_session_t *session = NULL;
+#if Z_FEATURE_SESSION_CHECK == 1
     // Try to upgrade session rc
     _z_session_rc_t sess_rc = _z_session_weak_upgrade_if_open(&querier->_zn);
     if (!_Z_RC_IS_NULL(&sess_rc)) {
@@ -1295,6 +1296,9 @@ z_result_t z_querier_get(const z_loaned_querier_t *querier, const char *paramete
     } else {
         ret = _Z_ERR_SESSION_CLOSED;
     }
+#else
+    session = _Z_RC_IN_VAL(&querier->_zn);
+#endif
 
     z_consolidation_mode_t consolidation_mode = querier->_consolidation_mode;
     if (consolidation_mode == Z_CONSOLIDATION_MODE_AUTO) {
@@ -1318,7 +1322,9 @@ z_result_t z_querier_get(const z_loaned_querier_t *querier, const char *paramete
         ret = _Z_ERR_SESSION_CLOSED;
     }
 
+#if Z_FEATURE_SESSION_CHECK == 1
     _z_session_rc_drop(&sess_rc);
+#endif
 
     // Clean-up
     z_bytes_drop(opt.payload);