diff --git a/src/session.c b/src/session.c
index 9b65374c..b6e8c864 100644
--- a/src/session.c
+++ b/src/session.c
@@ -1283,8 +1283,8 @@ _nc_server_get_cpblts_version(const struct ly_ctx *ctx, LYS_VERSION version, int
             free(yl_content_id);
             yl_content_id = NULL;
             continue;
-        } else if (mod->version != version) {
-            /* skip YANG 1.0 or 1.1 modules */
+        } else if (version && (mod->version != version)) {
+            /* skip modules not matching the requested YANG version (LYS_VERSION_UNDEF means all) */
             continue;
         }
 
@@ -1489,7 +1489,7 @@ nc_send_hello_io(struct nc_session *session, int config_locked)
         timeout_io = NC_CLIENT_HELLO_TIMEOUT * 1000;
         sid = NULL;
     } else {
-        cpblts = _nc_server_get_cpblts_version(session->ctx, LYS_VERSION_1_0, config_locked);
+        cpblts = _nc_server_get_cpblts_version(session->ctx, LYS_VERSION_UNDEF, config_locked);
         if (!cpblts) {
             return NC_MSG_ERROR;
         }