Index: firmware/App/Drivers/ConductivitySensors.c
===================================================================
diff -u -r53eaeea39c88b1894a6b2d7b5c2733fbf037e0da -r94a98f376c6c8c3785f05f5a1b19cc1108fe336e
--- firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 53eaeea39c88b1894a6b2d7b5c2733fbf037e0da)
+++ firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 94a98f376c6c8c3785f05f5a1b19cc1108fe336e)
@@ -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;