diff --git a/src/mesh/mesh_node.c b/src/mesh/mesh_node.c
index 9af1699a1..68651e293 100644
--- a/src/mesh/mesh_node.c
+++ b/src/mesh/mesh_node.c
@@ -118,6 +118,6 @@ void mesh_node_set_device_uuid(const uint8_t * device_uuid){
  * @brief Get Device UUID
  */
 const uint8_t * mesh_node_get_device_uuid(void){
-    return &mesh_node_get_device_uuid;
+    return mesh_node_device_uuid;
 }
 
diff --git a/src/mesh/pb_gatt.c b/src/mesh/pb_gatt.c
index 640ae98cc..d29cafb70 100644
--- a/src/mesh/pb_gatt.c
+++ b/src/mesh/pb_gatt.c
@@ -55,7 +55,6 @@ static union {
     uint8_t  segmentation_buffer[MESH_PROV_MAX_PROXY_PDU];
 } sar_buffer;
 
-static const uint8_t * pb_gatt_own_device_uuid;
 static const uint8_t * proxy_pdu;
 static uint16_t proxy_pdu_size;
 
@@ -179,8 +178,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
  * Setup mesh provisioning service
  * @param device_uuid
  */
-void pb_gatt_init(const uint8_t * device_uuid){
-    pb_gatt_own_device_uuid = device_uuid;
+void pb_gatt_init(void){
     // setup mesh provisioning service
     mesh_provisioning_service_server_init();
     mesh_provisioning_service_server_register_packet_handler(packet_handler);
diff --git a/src/mesh/pb_gatt.h b/src/mesh/pb_gatt.h
index a13d9d9a4..8f95d9235 100644
--- a/src/mesh/pb_gatt.h
+++ b/src/mesh/pb_gatt.h
@@ -50,9 +50,8 @@ extern "C" {
 
 /**
  * Setup mesh provisioning service
- * @param device_uuid
  */
-void pb_gatt_init(const uint8_t * device_uuid);
+void pb_gatt_init(void);
 
 /**
  * Register listener for Provisioning PDUs and events: MESH_PB_TRANSPORT_LINK_OPEN, MESH_PB_TRANSPORT_LINK_CLOSED, MESH_SUBEVENT_CAN_SEND_NOW
diff --git a/test/mesh/provisioning_device.c b/test/mesh/provisioning_device.c
index e4eaefba2..3b40a9730 100644
--- a/test/mesh/provisioning_device.c
+++ b/test/mesh/provisioning_device.c
@@ -826,7 +826,7 @@ void provisioning_device_init(const uint8_t * device_uuid){
     pb_adv_init(device_uuid);
     pb_adv_register_packet_handler(&provisioning_handle_pdu);
     // setup PB GATT
-    pb_gatt_init(device_uuid);
+    pb_gatt_init();
     pb_gatt_register_packet_handler(&provisioning_handle_pdu);
     
     pb_transport_cid = MESH_PB_TRANSPORT_INVALID_CID;
diff --git a/test/mesh/provisioning_device_test.cpp b/test/mesh/provisioning_device_test.cpp
index 41358af7d..9094b014e 100644
--- a/test/mesh/provisioning_device_test.cpp
+++ b/test/mesh/provisioning_device_test.cpp
@@ -106,7 +106,7 @@ static uint16_t  pdu_size;
  * @param DeviceUUID
  */
 void pb_adv_init(const uint8_t * device_uuid){}
-void pb_gatt_init(const uint8_t * device_uuid){}
+void pb_gatt_init(void){}
 
 /**
  * Close Link