Index: firmware/App/Drivers/CPLD.c
===================================================================
diff -u -r18692ff3afdbfbb6eba1e82570fdbcec468cac63 -r9970969e3aca3c3b37a7c322f85b9ce00e9bfdef
--- firmware/App/Drivers/CPLD.c	(.../CPLD.c)	(revision 18692ff3afdbfbb6eba1e82570fdbcec468cac63)
+++ firmware/App/Drivers/CPLD.c	(.../CPLD.c)	(revision 9970969e3aca3c3b37a7c322f85b9ce00e9bfdef)
@@ -65,8 +65,6 @@
 
 // ********** private function prototypes **********
 
-static void broadcastCPLDStatus( void );
-
 /*********************************************************************//**
  * @brief
  * The initCPLD function initializes the CPLD module.
@@ -152,8 +150,8 @@
             color = CPLD_CLEAN_LED_OFF;
             break;
     }
+
     cpldStatus.clean_led = color;
-    broadcastCPLDStatus();
 }
 
 /*********************************************************************//**
@@ -177,7 +175,6 @@
     }
 
     cpldStatus.fault_led = fault;   // Use fault for LED State because it flashes
-    broadcastCPLDStatus();
 }
 
 /*********************************************************************//**
@@ -198,8 +195,8 @@
     {
         CLR_AUDIO_ALARM();
     }
+
     cpldStatus.audio = level;
-    broadcastCPLDStatus();
 }
 
 /*********************************************************************//**
Index: firmware/App/Drivers/CPLD.h
===================================================================
diff -u -r18692ff3afdbfbb6eba1e82570fdbcec468cac63 -r9970969e3aca3c3b37a7c322f85b9ce00e9bfdef
--- firmware/App/Drivers/CPLD.h	(.../CPLD.h)	(revision 18692ff3afdbfbb6eba1e82570fdbcec468cac63)
+++ firmware/App/Drivers/CPLD.h	(.../CPLD.h)	(revision 9970969e3aca3c3b37a7c322f85b9ce00e9bfdef)
@@ -62,6 +62,8 @@
 void setCPLDFaultAudio( PIN_SIGNAL_STATE_T level );
 void getCPLDStatus( CPLD_STATUS_T *status );
 
+void broadcastCPLDStatus( void );
+
 /**@}*/
 
 #endif
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r18692ff3afdbfbb6eba1e82570fdbcec468cac63 -r9970969e3aca3c3b37a7c322f85b9ce00e9bfdef
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 18692ff3afdbfbb6eba1e82570fdbcec468cac63)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 9970969e3aca3c3b37a7c322f85b9ce00e9bfdef)
@@ -18,14 +18,14 @@
 #define __ALARM_MGMT_C__
 
 #include "AlarmMgmt.h"
+#include "CPLD.h"
 #include "OperationModes.h"
 #include "PersistentAlarm.h"
 #include "SafetyShutdown.h"
 #include "SystemComm.h"
 #include "SystemCommMessages.h"
 #include "TaskGeneral.h"
 #include "Timers.h"
-#include "CPLD.h"
 
 /**
  *  @addtogroup AlarmManagement
@@ -286,6 +286,7 @@
         data.safetyShutdownStatus = (U32)isSafetyShutdownActivated();
 
         broadcastData( MSG_ID_DG_ALARM_INFO, COMM_BUFFER_OUT_CAN_DG_ALARM, (U08*)&data, sizeof( SAFETY_SHUTDOWN_ACTIVATION_DATA_T ) );
+        broadcastCPLDStatus();
         alarmInfoPublicationTimerCounter = 0;
     }
 }