diff --git a/LibreHardwareMonitorLib/Hardware/Sensor.cs b/LibreHardwareMonitorLib/Hardware/Sensor.cs
index 1ab5179..10071c6 100644
--- a/LibreHardwareMonitorLib/Hardware/Sensor.cs
+++ b/LibreHardwareMonitorLib/Hardware/Sensor.cs
@@ -134,11 +134,14 @@ internal class Sensor : ISensor
             _currentValue = value;
             if (_trackMinMax)
             {
-                if (!Min.HasValue || Min > value)
-                    Min = value;
+                if (value.HasValue && !float.IsNaN(value.Value) && !float.IsInfinity(value.Value))
+                {
+                    if (!Min.HasValue || Min > value)
+                        Min = value;
 
-                if (!Max.HasValue || Max < value)
-                    Max = value;
+                    if (!Max.HasValue || Max < value)
+                        Max = value;
+                }
             }
         }
     }
@@ -273,4 +276,4 @@ internal class Sensor : ISensor
 
         _values.Add(new SensorValue(value, time));
     }
-}
\ No newline at end of file
+}