diff --git a/host-bmc/dbus_to_terminus_effecters.cpp b/host-bmc/dbus_to_terminus_effecters.cpp
index 52268ab..54eb71f 100644
--- a/host-bmc/dbus_to_terminus_effecters.cpp
+++ b/host-bmc/dbus_to_terminus_effecters.cpp
@@ -367,7 +367,7 @@
     }
 
     /* Update the current value of D-Bus interface*/
-    if (!std::isnan(val) && std::isnan(propValues.propertyValue))
+    if (std::isfinite(val) && !std::isfinite(propValues.propertyValue))
     {
         hostEffecterInfo[effecterInfoIndex]
             .dbusNumericEffecterInfo[dbusInfoIndex]
@@ -376,7 +376,7 @@
     }
 
     /* Bypass the setting when the current value is NA or setting value is NA */
-    if (std::isnan(propValues.propertyValue) || std::isnan(val))
+    if (!std::isfinite(propValues.propertyValue) || !std::isfinite(val))
     {
         return;
     }