diff --git a/monitor/fan.cpp b/monitor/fan.cpp
index 4b84fff..3b12905 100644
--- a/monitor/fan.cpp
+++ b/monitor/fan.cpp
@@ -61,8 +61,12 @@
         }
         catch (InvalidSensorError& e)
         {
-            // mark associated fan as nonfunctional
-            updateInventory(false);
+            // Count the number of failed tach sensors
+            if (++_numFailedSensor >= _numSensorFailsForNonFunc)
+            {
+                // Mark associated fan as nonfunctional
+                updateInventory(false);
+            }
         }
     }
 
diff --git a/monitor/fan.hpp b/monitor/fan.hpp
index 5136cee..603be10 100644
--- a/monitor/fan.hpp
+++ b/monitor/fan.hpp
@@ -181,6 +181,11 @@
     const size_t _numSensorFailsForNonFunc;
 
     /**
+     * The number of failed sensors
+     */
+    size_t _numFailedSensor = 0;
+
+    /**
      * @brief The current functional state of the fan
      */
     bool _functional = true;
diff --git a/monitor/tach_sensor.cpp b/monitor/tach_sensor.cpp
index 078b213..01baada 100644
--- a/monitor/tach_sensor.cpp
+++ b/monitor/tach_sensor.cpp
@@ -97,7 +97,7 @@
             log<level::ERR>(
                 fmt::format("Failed to retrieve tach sensor {}", _name)
                     .c_str());
-            // mark tach sensor as nonfunctional
+            // Mark tach sensor as nonfunctional
             setFunctional(false);
             throw InvalidSensorError();
         }