diff --git a/src/NukiNetworkLock.cpp b/src/NukiNetworkLock.cpp
index a32f1a2..bf8c61d 100644
--- a/src/NukiNetworkLock.cpp
+++ b/src/NukiNetworkLock.cpp
@@ -510,6 +510,9 @@ void NukiNetworkLock::publishKeyTurnerState(const NukiLock::KeyTurnerState& keyT
         {
             publishBool(mqtt_topic_battery_keypad_critical, keypadCritical, true);
         }
+
+        serializeJson(jsonBattery, _buffer, _bufferSize);
+        publishString(mqtt_topic_battery_basic_json, _buffer, true);
     }
     else
     {
@@ -523,9 +526,6 @@ void NukiNetworkLock::publishKeyTurnerState(const NukiLock::KeyTurnerState& keyT
     serializeJson(json, _buffer, _bufferSize);
     publishString(mqtt_topic_lock_json, _buffer, true);
 
-    serializeJson(jsonBattery, _buffer, _bufferSize);
-    publishString(mqtt_topic_battery_basic_json, _buffer, true);
-
     _firstTunerStatePublish = false;
 }
 
@@ -1524,4 +1524,4 @@ void NukiNetworkLock::fobActionToString(const int fobact, char* str) {
       strcpy(str, "undefined");
       break;
   }
-}
\ No newline at end of file
+}