diff --git a/flight/CopterControl/System/alarms.c b/flight/CopterControl/System/alarms.c
index 2ebc6385f..e899be779 100644
--- a/flight/CopterControl/System/alarms.c
+++ b/flight/CopterControl/System/alarms.c
@@ -77,7 +77,6 @@ int32_t AlarmsSet(SystemAlarmsAlarmElem alarm, SystemAlarmsAlarmOptions severity
     {
     	alarms.Alarm[alarm] = severity;
     	SystemAlarmsSet(&alarms);
-    	SystemAlarmsUpdated(); // force telemetry update since the alarm was changed
     }
 
     // Release lock
diff --git a/flight/OpenPilot/System/alarms.c b/flight/OpenPilot/System/alarms.c
index 2ebc6385f..e899be779 100644
--- a/flight/OpenPilot/System/alarms.c
+++ b/flight/OpenPilot/System/alarms.c
@@ -77,7 +77,6 @@ int32_t AlarmsSet(SystemAlarmsAlarmElem alarm, SystemAlarmsAlarmOptions severity
     {
     	alarms.Alarm[alarm] = severity;
     	SystemAlarmsSet(&alarms);
-    	SystemAlarmsUpdated(); // force telemetry update since the alarm was changed
     }
 
     // Release lock
diff --git a/shared/uavobjectdefinition/systemalarms.xml b/shared/uavobjectdefinition/systemalarms.xml
index 622afc173..54eedc8cd 100644
--- a/shared/uavobjectdefinition/systemalarms.xml
+++ b/shared/uavobjectdefinition/systemalarms.xml
@@ -5,7 +5,7 @@
         elementnames="OutOfMemory,StackOverflow,CPUOverload,EventSystem,SDCard,Telemetry,ManualControl,Actuator,Attitude,Stabilization,Guidance,AHRSComms,Battery,FlightTime,I2C,GPS" defaultvalue="Uninitialised"/>
         <access gcs="readwrite" flight="readwrite"/>
         <telemetrygcs acked="true" updatemode="onchange" period="0"/>
-        <telemetryflight acked="true" updatemode="periodic" period="4000"/>
+        <telemetryflight acked="true" updatemode="onchange" period="0"/>
         <logging updatemode="periodic" period="1000"/>
     </object>
 </xml>