diff --git a/Pachyderm/Client.swift b/Pachyderm/Client.swift
index 9d16a895..21668cb0 100644
--- a/Pachyderm/Client.swift
+++ b/Pachyderm/Client.swift
@@ -28,11 +28,25 @@ public class Client {
     
     static let decoder: JSONDecoder = {
         let decoder = JSONDecoder()
+        
         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)
+        let iso8601 = ISO8601DateFormatter()
+        decoder.dateDecodingStrategy = .custom({ (decoder) in
+            let container = try decoder.singleValueContainer()
+            let str = try container.decode(String.self)
+            // for the next time mastodon accidentally changes date formats >.>
+            if let date = formatter.date(from: str) {
+                return date
+            } else if let date = iso8601.date(from: str) {
+                return date
+            } else {
+                throw DecodingError.typeMismatch(Date.self, .init(codingPath: container.codingPath, debugDescription: "unexpected date format"))
+            }
+        })
+        
         return decoder
     }()