Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -rf19fa057e6227ce04670a0976d121bb684e06e7e -rdeba34e5074da9ac97d8bcbe995f554eec5c70ed
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision f19fa057e6227ce04670a0976d121bb684e06e7e)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision deba34e5074da9ac97d8bcbe995f554eec5c70ed)
@@ -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           ( 500 )                                                                 ///< Filter conductivity data for given time
-#define CONDUCTIVITY_TEMP_SAMPLE_FILTER_MS      ( 500 )                                                                 ///< Filter conductivity temperature data for given time
+#define CONDUCTIVITY_SAMPLE_FILTER_MS           ( 30 )                                                                 ///< Filter conductivity data for given time
+#define CONDUCTIVITY_TEMP_SAMPLE_FILTER_MS      ( 30 )                                                                 ///< Filter conductivity temperature data for given time
 #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.