Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -r53eaeea39c88b1894a6b2d7b5c2733fbf037e0da -r94a98f376c6c8c3785f05f5a1b19cc1108fe336e
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 53eaeea39c88b1894a6b2d7b5c2733fbf037e0da)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 94a98f376c6c8c3785f05f5a1b19cc1108fe336e)
@@ -694,10 +694,6 @@
 
     if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
     {
-        result = testConductivitySensorConductivityReadingsOverride( message );
-    }
-    else
-    {
 
         if ( payload.index != D74_COND )
         {
@@ -708,6 +704,10 @@
             result = testConductivitySensorReadingsOverride( message );
         }
     }
+    else
+    {
+        result = testConductivitySensorConductivityReadingsOverride( message );
+    }
 
     return result;
 }
@@ -731,10 +731,6 @@
 
     if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
     {
-        result = testConductivitySensorTemperatureReadingsOverride( message );
-    }
-    else
-    {
 
         if ( payload.index != D74_COND )
         {
@@ -745,6 +741,10 @@
             result = testConductivitySensorTemperatureReadingsOverride( message );
         }
     }
+    else
+    {
+        result = testConductivitySensorTemperatureReadingsOverride( message );
+    }
 
     return result;
 }