diff --git a/Pachyderm/Client.swift b/Pachyderm/Client.swift
index 8717680c..895a0c37 100644
--- a/Pachyderm/Client.swift
+++ b/Pachyderm/Client.swift
@@ -28,7 +28,11 @@ public class Client {
     
     lazy var decoder: JSONDecoder = {
         let decoder = JSONDecoder()
-        decoder.dateDecodingStrategy = .iso8601
+        let formatter = DateFormatter()
+        formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SZ"
+        formatter.timeZone = TimeZone(abbreviation: "UTC")
+        formatter.locale = Locale(identifier: "en_US_POSIX")
+        decoder.dateDecodingStrategy = .formatted(formatter)
         return decoder
     }()