diff --git a/src/mesh/MeshService.cpp b/src/mesh/MeshService.cpp
index 44094f1bb..4fd9523c0 100644
--- a/src/mesh/MeshService.cpp
+++ b/src/mesh/MeshService.cpp
@@ -320,7 +320,9 @@ meshtastic_NodeInfoLite *MeshService::refreshLocalMeshNode()
 
     position.time = getValidTime(RTCQualityFromNet);
 
-    updateBatteryLevel(powerStatus->getBatteryChargePercent());
+    if (powerStatus->getHasBattery() == 1) {
+        updateBatteryLevel(powerStatus->getBatteryChargePercent());
+    }
 
     return node;
 }
diff --git a/src/nimble/NimbleBluetooth.cpp b/src/nimble/NimbleBluetooth.cpp
index 3175e0f09..0b2a806c9 100644
--- a/src/nimble/NimbleBluetooth.cpp
+++ b/src/nimble/NimbleBluetooth.cpp
@@ -186,7 +186,7 @@ void NimbleBluetooth::setupService()
     // Setup the battery service
     NimBLEService *batteryService = bleServer->createService(NimBLEUUID((uint16_t)0x180f)); // 0x180F is the Battery Service
     BatteryCharacteristic = batteryService->createCharacteristic( // 0x2A19 is the Battery Level characteristic)
-        (uint16_t)0x2a19, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY);
+        (uint16_t)0x2a19, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY, 1);
 
     NimBLE2904 *batteryLevelDescriptor = (NimBLE2904 *)BatteryCharacteristic->createDescriptor((uint16_t)0x2904);
     batteryLevelDescriptor->setFormat(NimBLE2904::FORMAT_UINT8);
@@ -208,8 +208,10 @@ void NimbleBluetooth::startAdvertising()
 /// Given a level between 0-100, update the BLE attribute
 void updateBatteryLevel(uint8_t level)
 {
-    BatteryCharacteristic->setValue(&level, 1);
-    BatteryCharacteristic->notify();
+    if ((config.bluetooth.enabled == true) && bleServer && nimbleBluetooth->isConnected()) {
+        BatteryCharacteristic->setValue(&level, 1);
+        BatteryCharacteristic->notify();
+    }
 }
 
 void NimbleBluetooth::clearBonds()