diff --git a/jellyfin_kodi/jellyfin/http.py b/jellyfin_kodi/jellyfin/http.py
index a58ad961..4545ca59 100644
--- a/jellyfin_kodi/jellyfin/http.py
+++ b/jellyfin_kodi/jellyfin/http.py
@@ -179,7 +179,12 @@ class HTTP(object):
 
             else:
                 try:
-                    self.config.data["server-time"] = r.headers["Date"]
+                    # Prefer custom Server-Time header in ISO 8601 format
+                    # TODO: Clean up once the probability of most users having
+                    #       the updated server-side plugin is high.
+                    self.config.data["server-time"] = r.headers.get(
+                        "Server-Time", r.headers.get("Date")
+                    )
                     elapsed = int(r.elapsed.total_seconds() * 1000)
                     response = r.json()
                     LOG.debug("---<[ http ][%s ms]", elapsed)
diff --git a/jellyfin_kodi/library.py b/jellyfin_kodi/library.py
index 45242976..5e143ee0 100644
--- a/jellyfin_kodi/library.py
+++ b/jellyfin_kodi/library.py
@@ -525,18 +525,30 @@ class Library(threading.Thread):
         return True
 
     def save_last_sync(self):
+        _raw_time = self.server.config.data["server-time"]
+        # The ISO 8601 header always end with Z
+        if _raw_time and _raw_time[-1] == "Z":
+            time_now = datetime.strptime(_raw_time, "%Y-%m-%dT%H:%M:%SZ")
+        else:
+            try:
+                # TODO: Clean up once the probability of most users having
+                #       the updated server-side plugin is high.
+                LOG.warning(
+                    "Server time not in ISO 8601 format, using fallback (update KodiSyncQueue)."
+                )
+                import email.utils
 
-        try:
-            time_now = datetime.strptime(
-                self.server.config.data["server-time"].split(", ", 1)[1],
-                "%d %b %Y %H:%M:%S GMT",
-            ) - timedelta(minutes=2)
-        except Exception as error:
+                time_now = email.utils.parsedate_to_datetime(_raw_time)
 
-            LOG.exception(error)
-            time_now = datetime.utcnow() - timedelta(minutes=2)
+            except Exception as error:
+                LOG.warning(error)
+                LOG.warning("Failed to parse server time, falling back to client time.")
+                time_now = datetime.utcnow()
 
-        last_sync = time_now.strftime("%Y-%m-%dT%H:%M:%Sz")
+        # Add some tolerance in case time is out of sync with server
+        time_now -= timedelta(minutes=2)
+
+        last_sync = time_now.strftime("%Y-%m-%dT%H:%M:%SZ")
         settings("LastIncrementalSync", value=last_sync)
         LOG.info("--[ sync/%s ]", last_sync)