Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -r3d0c86bab8540914d9f3cfdbdd321f35db623999 -r1b4aea0cddd976d7951d1776fa772679776d154e
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 3d0c86bab8540914d9f3cfdbdd321f35db623999)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 1b4aea0cddd976d7951d1776fa772679776d154e)
@@ -7,8 +7,8 @@
 *
 * @file    Conductivity.c
 *
-* @author  (last)      Michael Garthwaite
-* @date    (last)      15-Apr-2026
+* @author  (last)      Sameer Kalliadan Poyil
+* @date    (last)      16-Apr-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  13-Sep-2024
@@ -35,8 +35,8 @@
 #define COND_SENSOR_REPORT_PERIOD               ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )                              ///< Broadcast conductivity values message every second.
 #define COND_SENSOR_UPDATE_INTERVAL             ( 700 / TASK_PRIORITY_INTERVAL )                                        ///< Time in task intervals for new sensor data
 #define DATA_PUBLISH_COUNTER_START_COUNT        40                                                                      ///< Data publish counter start count.
-#define CONDUCTIVITY_SAMPLE_FILTER_MS           ( 50 )                                                                  ///< Filter conductivity data for given time. Currently set to have 5 samples over 3.5s ( 700ms sample rate )
-#define CONDUCTIVITY_TEMP_SAMPLE_FILTER_MS      ( 50 )                                                                  ///< Filter conductivity temperature data for given time. Currently set to have 5 samples over 3.5s ( 700ms sample rate )
+#define CONDUCTIVITY_SAMPLE_FILTER_MS           ( 30 )                                                                  ///< Filter conductivity data for given time. Currently set to have 5 samples over 3.5s ( 700ms sample rate )
+#define CONDUCTIVITY_TEMP_SAMPLE_FILTER_MS      ( 30 )                                                                  ///< Filter conductivity temperature data for given time. Currently set to have 5 samples over 3.5s ( 700ms sample rate )
 #define SIZE_OF_COND_ROLLING_AVG                ( CONDUCTIVITY_SAMPLE_FILTER_MS / TASK_PRIORITY_INTERVAL )              ///< Filtered conductivity moving average sample count.
 #define SIZE_OF_COND_TEMP_ROLLING_AVG           ( CONDUCTIVITY_TEMP_SAMPLE_FILTER_MS / TASK_PRIORITY_INTERVAL )         ///< Filtered conductivity temprature moving average sample count.
 #define RO_RR_MOVING_AVG_NUM_OF_SAMPLES         30                                                                      ///< RO rejection ratio moving average number of samples.
@@ -84,10 +84,6 @@
 static U32 roRRCount;                                                                                                   ///< RO rejection ratio Number of samples in average buffer.
 static F32 roRRTankFillAvg;                                                                                             ///< Average RO rejection ratio during permeate tank fill state.
 static U32 roRRSampleIntervalCounter;                                                                                   ///< RO rejection ratio sample collection timer counter.
-static U32 condtempDataCollectionTimeInterval;                                                                          ///< Conductivity Temperature data collection time interval in task counts.
-static U32 condtempSampleIntervalCounter;                                                                               ///< Conductivity Temperature sensor sample collection timer counter.
-static U32 condDataCollectionTimeInterval;                                                                              ///< Conductivity data collection time interval in task counts.
-static U32 condSampleIntervalCounter;                                                                                   ///< Conductivity sensor sample collection timer counter.
 
 // ********** private function prototypes **********
 
@@ -126,8 +122,6 @@
     roRRAvg.ovInitData                = 0.0F;
     roRRAvg.override                  = OVERRIDE_RESET;
     roRRSampleIntervalCounter         = 0;
-    condtempDataCollectionTimeInterval= COND_SENSOR_UPDATE_INTERVAL;
-    condtempSampleIntervalCounter     = 0;
 
     memset( &roRRSamples, 0, sizeof( roRRSamples ) );
 
@@ -293,6 +287,7 @@
             filteredConductivityReadings[ sensor ].conductivityReadingsIdx = INC_WRAP( filteredConductivityReadings[ sensor ].conductivityReadingsIdx, 0, SIZE_OF_COND_ROLLING_AVG - 1 );
             filteredConductivityReadings[ sensor ].conductivityReadingsCount = INC_CAP( filteredConductivityReadings[ sensor ].conductivityReadingsCount, SIZE_OF_COND_ROLLING_AVG );
             filteredcurrentConductivityReadings[ sensor ].data = filteredConductivityReadings[ sensor ].conductivityReadingsTotal / (F32)filteredConductivityReadings[ sensor ].conductivityReadingsCount;
+            freshData = FALSE;
         }
     }
 }
@@ -380,6 +375,7 @@
             filteredConductivityTemperatureReadings[sensor].conductivityTempReadingsIdx = INC_WRAP( filteredConductivityTemperatureReadings[sensor].conductivityTempReadingsIdx, 0, SIZE_OF_COND_TEMP_ROLLING_AVG - 1 );
             filteredConductivityTemperatureReadings[sensor].conductivityTempReadingsCount = INC_CAP( filteredConductivityTemperatureReadings[sensor].conductivityTempReadingsCount, SIZE_OF_COND_TEMP_ROLLING_AVG );
             filteredcurrentTemperatureReadings[sensor].data = filteredConductivityTemperatureReadings[sensor].conductivityTempReadingsTotal / (F32)filteredConductivityTemperatureReadings[sensor].conductivityTempReadingsCount;
+            freshData = FALSE;
         }
     }
 }