diff --git a/ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp b/ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp
index a30172fb0..be81befb7 100644
--- a/ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp
+++ b/ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp
@@ -247,14 +247,6 @@ FirmwareIAPObj::DataFields UAVObjectUtilManager::getFirmwareIap()
     if (!firmwareIap)
         return dummy;
 
-    // The code below will ask for the object update and wait for the updated to be received,
-    // or the timeout of the timer, set to 1 second.
-    QEventLoop loop;
-    connect(firmwareIap, SIGNAL(objectUpdated(UAVObject*)), &loop, SLOT(quit()));
-    QTimer::singleShot(1000, &loop, SLOT(quit())); // Create a timeout
-    firmwareIap->requestUpdate();
-    loop.exec();
-
     return firmwareIap->getData();
 }
 
diff --git a/shared/uavobjectdefinition/firmwareiapobj.xml b/shared/uavobjectdefinition/firmwareiapobj.xml
index 30b070857..be8431ef5 100644
--- a/shared/uavobjectdefinition/firmwareiapobj.xml
+++ b/shared/uavobjectdefinition/firmwareiapobj.xml
@@ -10,7 +10,7 @@
         <field name="crc" units="" type="uint32" elements="1"/> 
         <access gcs="readwrite" flight="readwrite"/> 
         <telemetrygcs acked="true" updatemode="manual" period="0"/> 
-        <telemetryflight acked="true" updatemode="manual" period="0"/> 
+        <telemetryflight acked="true" updatemode="onchange" period="0"/> 
         <logging updatemode="manual" period="0"/> 
 </object> 
 </xml>