diff --git a/features/nanostack/mbed-mesh-api/mbed_lib.json b/features/nanostack/mbed-mesh-api/mbed_lib.json
index 133f6ecfbc..5bf9046682 100644
--- a/features/nanostack/mbed-mesh-api/mbed_lib.json
+++ b/features/nanostack/mbed-mesh-api/mbed_lib.json
@@ -119,11 +119,11 @@
             "value": "3"
         },
         "wisun-operating-class": {
-            "help": "Operating class.",
+            "help": "Operating class. Use 255 to use Nanostack default",
             "value": "255"
         },
         "wisun-operating-mode": {
-            "help": "Operating mode.",
+            "help": "Operating mode. Use 255 to use Nanostack default",
             "value": "255"
         },
         "wisun-uc-channel-function": {
diff --git a/features/nanostack/mbed-mesh-api/source/wisun_tasklet.c b/features/nanostack/mbed-mesh-api/source/wisun_tasklet.c
index 1396082d1e..f75e13b565 100644
--- a/features/nanostack/mbed-mesh-api/source/wisun_tasklet.c
+++ b/features/nanostack/mbed-mesh-api/source/wisun_tasklet.c
@@ -95,7 +95,7 @@ typedef struct {
 /* Tasklet data */
 static wisun_tasklet_data_str_t *wisun_tasklet_data_ptr = NULL;
 static wisun_certificates_t *wisun_certificates_ptr = NULL;
-static wisun_network_settings_t wisun_settings_str = {NULL, WS_NA, WS_NA, WS_NA};
+static wisun_network_settings_t wisun_settings_str = {NULL, MBED_CONF_MBED_MESH_API_WISUN_REGULATORY_DOMAIN, MBED_CONF_MBED_MESH_API_WISUN_OPERATING_CLASS, MBED_CONF_MBED_MESH_API_WISUN_OPERATING_MODE};
 static mac_api_t *mac_api = NULL;
 
 extern fhss_timer_t fhss_functions;