diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp
index c061878a..2ed3776e 100644
--- a/app/src/main/cpp/PhoneDevice.cpp
+++ b/app/src/main/cpp/PhoneDevice.cpp
@@ -646,13 +646,12 @@ float CPhoneDevice::QueryBattaryVoltage(int timesForAvg, bool* isCharging)
     int val = 0;
     int totalVals = 0;
     float chargingBusVoltage = 0.0f;
-    for (int idx = 0; idx < timesForAvg; )
+    for (int idx = 0; idx < timesForAvg; idx++)
     {
         val = GpioControl::getChargingBusVoltage();
-        if (val > 0)
+        if (val > 1000)
         {
             chargingBusVoltage = (float)val / 1000.0;
-            idx++;
             break;
         }
     }