diff --git a/src/AutoPilotPlugins/APM/APMPowerComponent.qml b/src/AutoPilotPlugins/APM/APMPowerComponent.qml
index 9a1c6b19e965c190174543d6d75ea50581922574..7cb5437a1d0a5f67c83b9e17f2195dff1055c894 100644
--- a/src/AutoPilotPlugins/APM/APMPowerComponent.qml
+++ b/src/AutoPilotPlugins/APM/APMPowerComponent.qml
@@ -138,11 +138,11 @@ SetupPage {
 
                                 onClicked:  {
                                     var measuredVoltageValue = parseFloat(measuredVoltage.text)
-                                    if (measuredVoltageValue == 0) {
+                                    if (measuredVoltageValue == 0 || isNaN(measuredVoltageValue)) {
                                         return
                                     }
                                     var newVoltageMultiplier = (measuredVoltageValue * battVoltMult.value) / controller.vehicle.battery.voltage.value
-                                    if (newVoltageMultiplier != 0) {
+                                    if (newVoltageMultiplier > 0) {
                                         battVoltMult.value = newVoltageMultiplier
                                     }
                                 }
diff --git a/src/AutoPilotPlugins/PX4/PowerComponent.qml b/src/AutoPilotPlugins/PX4/PowerComponent.qml
index 8ccdc9270aad7615f11ca40aeb9f85699926d717..5b910834138d8caa901b9673cd44ef0ff91f5618 100644
--- a/src/AutoPilotPlugins/PX4/PowerComponent.qml
+++ b/src/AutoPilotPlugins/PX4/PowerComponent.qml
@@ -144,11 +144,11 @@ SetupPage {
 
                                 onClicked:  {
                                     var measuredVoltageValue = parseFloat(measuredVoltage.text)
-                                    if (measuredVoltageValue == 0) {
+                                    if (measuredVoltageValue == 0 || isNaN(measuredVoltageValue)) {
                                         return
                                     }
                                     var newVoltageDivider = (measuredVoltageValue * battVoltageDivider.value) / controller.vehicle.battery.voltage.value
-                                    if (newVoltageDivider != 0) {
+                                    if (newVoltageDivider > 0) {
                                         battVoltageDivider.value = newVoltageDivider
                                     }
                                 }