diff --git a/power-supply/power_supply.cpp b/power-supply/power_supply.cpp
index 1dcf462..f6f658a 100644
--- a/power-supply/power_supply.cpp
+++ b/power-supply/power_supply.cpp
@@ -328,7 +328,7 @@
             }
         }
 
-        if (powerOnFault >= FAULT_COUNT)
+        if (!faultFound && (powerOnFault >= FAULT_COUNT))
         {
             faultFound = true;
 
@@ -372,7 +372,7 @@
             }
         }
 
-        if (outputOCFault >= FAULT_COUNT)
+        if (!faultFound && (outputOCFault >= FAULT_COUNT))
         {
             util::NamesValues nv;
             nv.add("STATUS_WORD", statusWord);
@@ -413,7 +413,7 @@
             }
         }
 
-        if (outputOVFault >= FAULT_COUNT)
+        if (!faultFound && (outputOVFault >= FAULT_COUNT))
         {
             util::NamesValues nv;
             nv.add("STATUS_WORD", statusWord);
@@ -454,7 +454,7 @@
             }
         }
 
-        if (fanFault >= FAULT_COUNT)
+        if (!faultFound && (fanFault >= FAULT_COUNT))
         {
             util::NamesValues nv;
             nv.add("STATUS_WORD", statusWord);
@@ -500,7 +500,7 @@
             }
         }
 
-        if (temperatureFault >= FAULT_COUNT)
+        if (!faultFound && (temperatureFault >= FAULT_COUNT))
         {
             // The power supply has had an over-temperature condition.
             // This may not result in a shutdown if experienced for a short