diff --git a/nimble/host/util/src/addr.c b/nimble/host/util/src/addr.c
index 207def0d8..0071bb33f 100644
--- a/nimble/host/util/src/addr.c
+++ b/nimble/host/util/src/addr.c
@@ -28,9 +28,10 @@
 static int
 ble_hs_util_load_rand_addr(ble_addr_t *addr)
 {
+    int rc = BLE_HS_ENOADDR;
+
 #if MYNEWT_VAL(BLE_HCI_VS)
     struct ble_hci_vs_rd_static_addr_rp rsp;
-    int rc;
 
     rc = ble_hs_hci_cmd_tx(BLE_HCI_OP(BLE_HCI_OGF_VENDOR,
                                       BLE_HCI_OCF_VS_RD_STATIC_ADDR),
@@ -43,14 +44,12 @@ ble_hs_util_load_rand_addr(ble_addr_t *addr)
 #endif
 
 #if SOC_ESP_NIMBLE_CONTROLLER
-    int rc;
-
     rc = esp_ble_hw_get_static_addr((esp_ble_addr_t *)addr);
     if (rc == 0) {
         return 0;
     }
 #endif
-    return BLE_HS_ENOADDR;
+    return rc;
 }
 
 static int