diff --git a/gps-track b/gps-track
index 572d662..03c551c 100644
--- a/gps-track
+++ b/gps-track
@@ -11,8 +11,13 @@
 :local Gps [ / system gps monitor once as-value ];
 
 if ($Gps->"valid" = true) do={
-  :set ($Gps->"latitude") [ :pick ($Gps->"latitude") 0 [ :find ($Gps->"latitude") "\00" ] ];
-  :set ($Gps->"longitude") [ :pick ($Gps->"longitude") 0 [ :find ($Gps->"longitude") "\00" ] ];
+  # TODO: remove workaround when trailing zero bytes are gone
+  :if (($Gps->"latitude") ~ "\00") do={
+    :set ($Gps->"latitude") [ :pick ($Gps->"latitude") 0 [ :find ($Gps->"latitude") "\00" ] ];
+  }
+  :if (($Gps->"longitude") ~ "\00") do={
+    :set ($Gps->"longitude") [ :pick ($Gps->"longitude") 0 [ :find ($Gps->"longitude") "\00" ] ];
+  }
   :tool fetch check-certificate=yes-without-crl \
     $GpsTrackUrl keep-result=no \
     http-method=post http-header-field="Content-Type: application/json" \