diff --git a/main/battery.cpp b/main/battery.cpp
index b79c557..3de7a8b 100644
--- a/main/battery.cpp
+++ b/main/battery.cpp
@@ -196,5 +196,5 @@ std::string getBatteryDebugString()
 }
 
 namespace battery {
-float bootBatPercentage{-1};
+std::optional<float> bootBatPercentage;
 }
diff --git a/main/battery.h b/main/battery.h
index b67dd1c..e17ff06 100644
--- a/main/battery.h
+++ b/main/battery.h
@@ -34,5 +34,5 @@ float getPercentageByWh(float wh);
 float getTarget_mAh();
 
 namespace battery {
-extern float bootBatPercentage;
+extern std::optional<float> bootBatPercentage;
 }
diff --git a/main/displays/menus/batterymenu.cpp b/main/displays/menus/batterymenu.cpp
index 2c19763..d3b5d96 100644
--- a/main/displays/menus/batterymenu.cpp
+++ b/main/displays/menus/batterymenu.cpp
@@ -102,7 +102,8 @@ void BatteryMenu::redraw()
     avgVoltage = avgVoltage / controllers.size();
 
     const auto batPercent = getBatteryPercentage(avgVoltage, BatteryCellType(configs.battery.cellType.value));
-    m_doubleProgressBarBatPercentage.redraw(batPercent, battery::bootBatPercentage);
+    if (battery::bootBatPercentage)
+        m_doubleProgressBarBatPercentage.redraw(batPercent, *battery::bootBatPercentage);
 }
 
 void BatteryMenu::back()
diff --git a/main/main.cpp b/main/main.cpp
index d63351d..6953535 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -113,7 +113,7 @@ extern "C" void app_main()
             lastStatsPush = now;
         }
 
-        if (battery::bootBatPercentage == -1)
+        if (!battery::bootBatPercentage)
         {
             if(controllers.front.feedbackValid && controllers.back.feedbackValid)
             {