Index: firmware/App/Controllers/Switches.c
===================================================================
diff -u -radeea598350354a833fff375526b888d0e6b6d48 -r7ce76ebd80b818d51dc61fd7f0c0fe94a242d182
--- firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision adeea598350354a833fff375526b888d0e6b6d48)
+++ firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 7ce76ebd80b818d51dc61fd7f0c0fe94a242d182)
@@ -30,8 +30,9 @@
 
 // ********** private definitions **********
 
-#define SWITCHES_DATA_PUB_INTERVAL      ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )               ///< Interval (ms/task time) at which the switches data is published on the CAN bus.
-#define SWITCHES_DEBOUNCE_TIME_MS       ( MS_PER_SECOND / 4 )                                   ///< Switches debounce time in milliseconds.
+#define SWITCHES_DATA_PUB_INTERVAL        ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )               ///< Interval (ms/task time) at which the switches data is published on the CAN bus.
+#define SWITCHES_DEBOUNCE_TIME_MS         ( MS_PER_SECOND / 4 )                                   ///< Switches debounce time in milliseconds.
+#define DATA_PUBLISH_COUNTER_START_COUNT  7                                                       ///< Data publish counter start count.
 
 /// Switch status structure
 typedef struct
@@ -62,7 +63,7 @@
 {
     U08 i;
 
-    switchesDataPublicationCounter = 0;
+    switchesDataPublicationCounter = DATA_PUBLISH_COUNTER_START_COUNT;
 
     // Initialize all the switches
     for ( i = 0; i < NUM_OF_DOORS_AND_CAPS; i++ )
@@ -184,7 +185,7 @@
         data.dialysateCap   = (U32)getSwitchStatus( DIALYSATE_CAP );
         data.fluidDoor      = (U32)getSwitchStatus( FLUID_DOOR );
 
-        switchesDataPublicationCounter = 0;
+        switchesDataPublicationCounter = DATA_PUBLISH_COUNTER_START_COUNT;
 
         broadcastData( MSG_ID_DG_SWITCHES_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( SWITCHES_DATA_T ) );
     }