Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -r980c9344c1f0f2074240ce2b0ef36fd6ecdd531f -rc53a264ed214a1cd44c81a11a698becb92666e79
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 980c9344c1f0f2074240ce2b0ef36fd6ecdd531f)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision c53a264ed214a1cd44c81a11a698becb92666e79)
@@ -288,8 +288,9 @@
             filteredConductivityReadings[ sensor ].conductivityReadingsCount = INC_CAP( filteredConductivityReadings[ sensor ].conductivityReadingsCount, SIZE_OF_COND_ROLLING_AVG );
             filteredcurrentConductivityReadings[ sensor ].data = filteredConductivityReadings[ sensor ].conductivityReadingsTotal / (F32)filteredConductivityReadings[ sensor ].conductivityReadingsCount;
         }
+        condSampleIntervalCounter = 0;
     }
-    condSampleIntervalCounter = 0;
+
 }
 
 /*********************************************************************//**