Index: firmware/App/Drivers/ConductivitySensors.c
===================================================================
diff -u -r7983907af837390c90979b1ac727f3f55f0b7ae2 -rbc7dad193df69c64cf213db463e5115b1ba8a5f0
--- firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 7983907af837390c90979b1ac727f3f55f0b7ae2)
+++ firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision bc7dad193df69c64cf213db463e5115b1ba8a5f0)
@@ -905,6 +905,12 @@
     F32 zeta = 0.0;
     F32 R  = conductivitySensorStatus[ sensorNum ].rawResistance;
 
+    // To prevent nan's being thrown into our rolling average by dividing by 0, we set to 1.
+    if ( R == 0 )
+    {
+        R = 1;
+    }
+
     if ( TRUE == isFPSensor )
     {
         eta = conductivitySensorCoefficients[ sensorNum ].eta_low;