diff --git a/flight/modules/CameraControl/cameracontrol.c b/flight/modules/CameraControl/cameracontrol.c
index 3d05893a6..8156c0311 100644
--- a/flight/modules/CameraControl/cameracontrol.c
+++ b/flight/modules/CameraControl/cameracontrol.c
@@ -331,7 +331,7 @@ static void FillActivityInfo()
         activity->TriggerMilliSecond = time.MilliSecond;
     }
 
-    activity->SysTS = PIOS_DELAY_GetuS();
+    activity->SystemTS = xTaskGetTickCount() * portTICK_RATE_MS;
     {
         AttitudeStateData attitude;
         AttitudeStateGet(&attitude);
diff --git a/shared/uavobjectdefinition/cameracontrolactivity.xml b/shared/uavobjectdefinition/cameracontrolactivity.xml
index 4490fc620..d9ffefe97 100644
--- a/shared/uavobjectdefinition/cameracontrolactivity.xml
+++ b/shared/uavobjectdefinition/cameracontrolactivity.xml
@@ -16,7 +16,7 @@
         <field name="TriggerMilliSecond" units="" type="int16" elements="1"/>
         <field name="Activity" units="" type="enum" elements="1" options="Idle,TriggerPicture,StartVideo,StopVideo" default="None"/>
         <field name="Reason" units="" type="enum" elements="1" options="Manual,AutoDistance,AutoTime" default="Manual"/>
-        <field name="SysTS" units="us" type="uint32" elements="1"/>
+        <field name="SystemTS" units="ms" type="uint32" elements="1"/>
         <access gcs="readwrite" flight="readwrite"/>
         <telemetrygcs acked="false" updatemode="manual" period="0"/>
         <telemetryflight acked="false" updatemode="periodic" period="1000"/>