diff --git a/server/src/main/java/au/org/aodn/ogcapi/server/features/RestServices.java b/server/src/main/java/au/org/aodn/ogcapi/server/features/RestServices.java
index 95f94d11..edf91f2a 100644
--- a/server/src/main/java/au/org/aodn/ogcapi/server/features/RestServices.java
+++ b/server/src/main/java/au/org/aodn/ogcapi/server/features/RestServices.java
@@ -129,8 +129,9 @@ public ResponseEntity<?> getWaveBuoys(String collectionID, String from) {
             return ResponseEntity.badRequest().body("Parameter 'datetime' is required and must be in 'from/to' format");
         }
 
-        java.time.LocalDate localDate = java.time.LocalDate.parse(from);
-        String to = localDate.plusDays(1).toString();
+        java.time.ZonedDateTime fromDateTime = java.time.ZonedDateTime.parse(from);
+        String to = fromDateTime.plusDays(1)
+            .format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSSSSSSS'Z'"));
         try {
            return ResponseEntity
                     .ok()