diff --git a/features/nanostack/mbed-mesh-api/mbed-mesh-api/mesh_interface_types.h b/features/nanostack/mbed-mesh-api/mbed-mesh-api/mesh_interface_types.h
index 7a6846955d..e6a5a7334a 100644
--- a/features/nanostack/mbed-mesh-api/mbed-mesh-api/mesh_interface_types.h
+++ b/features/nanostack/mbed-mesh-api/mbed-mesh-api/mesh_interface_types.h
@@ -59,7 +59,9 @@ typedef enum {
 typedef enum {
     MESH_DEVICE_TYPE_THREAD_ROUTER = 0,         /*<! Thread router */
     MESH_DEVICE_TYPE_THREAD_SLEEPY_END_DEVICE,  /*<! Thread Sleepy end device */
-    MESH_DEVICE_TYPE_THREAD_MINIMAL_END_DEVICE  /*<! Thread minimal end device */
+    MESH_DEVICE_TYPE_THREAD_MINIMAL_END_DEVICE, /*<! Thread minimal end device */
+    MESH_DEVICE_TYPE_WISUN_ROUTER,              /*<! Wi-SUN router */
+    MESH_DEVICE_TYPE_WISUN_BORDER_ROUTER        /*<! Wi-SUN border router */
 } mesh_device_type_t;
 
 #ifdef __cplusplus
diff --git a/features/nanostack/mbed-mesh-api/mbed_lib.json b/features/nanostack/mbed-mesh-api/mbed_lib.json
index 8af1e2e24e..6b4bdb6385 100644
--- a/features/nanostack/mbed-mesh-api/mbed_lib.json
+++ b/features/nanostack/mbed-mesh-api/mbed_lib.json
@@ -154,6 +154,10 @@
             "help": "Unicast dwell interval. Range: 15-255 milliseconds",
             "value": 0
         },
+        "wisun-device-type": {
+            "help": "Supported device operating modes: MESH_DEVICE_TYPE_WISUN_ROUTER, MESH_DEVICE_TYPE_WISUN_BORDER_ROUTER",
+            "value": "MESH_DEVICE_TYPE_WISUN_ROUTER"
+        },
         "certificate-header": {
             "help": "File name of the certificate header file (used on include directive)",
             "value": null
diff --git a/features/nanostack/mbed-mesh-api/source/wisun_tasklet.c b/features/nanostack/mbed-mesh-api/source/wisun_tasklet.c
index f822ab823d..017a48bc84 100644
--- a/features/nanostack/mbed-mesh-api/source/wisun_tasklet.c
+++ b/features/nanostack/mbed-mesh-api/source/wisun_tasklet.c
@@ -252,7 +252,12 @@ static void wisun_tasklet_configure_and_connect_to_network(void)
     int status;
     fhss_timer_t *fhss_timer_ptr = &fhss_functions;
 
-    wisun_tasklet_data_ptr->operating_mode = NET_6LOWPAN_ROUTER;
+    if (MBED_CONF_MBED_MESH_API_WISUN_DEVICE_TYPE == MESH_DEVICE_TYPE_WISUN_BORDER_ROUTER) {
+        wisun_tasklet_data_ptr->operating_mode = NET_6LOWPAN_BORDER_ROUTER;
+    } else {
+        wisun_tasklet_data_ptr->operating_mode = NET_6LOWPAN_ROUTER;
+    }
+
     wisun_tasklet_data_ptr->operating_mode_extension = NET_6LOWPAN_WS;
 
     arm_nwk_interface_configure_6lowpan_bootstrap_set(