diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc
index 3533b5d79722612f5f26065d5bcc96aaa3c8abac..b1c6d642676e8e041de60d8708b92d75ba46bc53 100644
--- a/src/uas/UAS.cc
+++ b/src/uas/UAS.cc
@@ -389,15 +389,15 @@ quint64 UAS::getUnixTime(quint64 time)
     {
         if (onboardTimeOffset == 0)
         {
-            onboardTimeOffset = MG::TIME::getGroundTimeNow() - time;
+            onboardTimeOffset = MG::TIME::getGroundTimeNow() - time/1000;
         }
-        return time + onboardTimeOffset;
+        return time/1000 + onboardTimeOffset;
     }
     else
     {
         // Time is not zero and larger than 40 years -> has to be
         // a Unix epoch timestamp. Do nothing.
-        return time;
+        return time/1000;
     }
 }