Index: firmware/App/Controllers/FluidLeak.c
===================================================================
diff -u -r025612ad77fe630889a364586de54bffe5262d56 -r31aa23b12f37b9d16b5160369ccb7dab6c6eca4d
--- firmware/App/Controllers/FluidLeak.c	(.../FluidLeak.c)	(revision 025612ad77fe630889a364586de54bffe5262d56)
+++ firmware/App/Controllers/FluidLeak.c	(.../FluidLeak.c)	(revision 31aa23b12f37b9d16b5160369ccb7dab6c6eca4d)
@@ -31,11 +31,12 @@
 
 // ********** private definitions **********
 
-#define FLUID_LEAK_PUB_INTERVAL          ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )         ///< Interval (ms/task time) at which the fluid leak data is published on the CAN bus.
+#define FLUID_LEAK_PUB_INTERVAL           ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )         ///< Interval (ms/task time) at which the fluid leak data is published on the CAN bus.
+#define DATA_PUBLISH_COUNTER_START_COUNT  39                                                 ///< Data publish counter start count.
 
 // ********** private data **********
 
-static U32 fluidLeakStatePublicationTimerCounter = 0;                                       ///< Timer counter used to schedule fluid leak publication to CAN bus.
+static U32 fluidLeakStatePublicationTimerCounter;                                            ///< Timer counter used to schedule fluid leak publication to CAN bus.
 
 /// Interval (in ms) at which to publish fluid leak data to CAN bus.
 static OVERRIDE_U32_T fluidLeakStatePublishInterval = { FLUID_LEAK_PUB_INTERVAL, FLUID_LEAK_PUB_INTERVAL, 0, 0 };
@@ -54,10 +55,11 @@
  *************************************************************************/
 void initFluidLeak( void )
 {
-    fluidLeakState.data = FLUID_LEAK_STATE_DRY;
-    fluidLeakState.ovData = FLUID_LEAK_STATE_DRY;
-    fluidLeakState.ovInitData = FLUID_LEAK_STATE_DRY;
-    fluidLeakState.override = OVERRIDE_RESET;
+    fluidLeakState.data                   = FLUID_LEAK_STATE_DRY;
+    fluidLeakState.ovData                 = FLUID_LEAK_STATE_DRY;
+    fluidLeakState.ovInitData             = FLUID_LEAK_STATE_DRY;
+    fluidLeakState.override               = OVERRIDE_RESET;
+    fluidLeakStatePublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
 }
 
 /*********************************************************************//**
@@ -135,7 +137,7 @@
         U32 state = (U32)getFluidLeakState();
 
         broadcastData( MSG_ID_DG_FLUID_LEAK_STATE, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&state, sizeof( U32 ) );
-        fluidLeakStatePublicationTimerCounter = 0;
+        fluidLeakStatePublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
     }
 }