diff --git a/MediaBrowser.Common/Json/Converters/JsonNullableStructConverter.cs b/MediaBrowser.Common/Json/Converters/JsonNullableStructConverter.cs
new file mode 100644
index 0000000000..cffc41ba34
--- /dev/null
+++ b/MediaBrowser.Common/Json/Converters/JsonNullableStructConverter.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace MediaBrowser.Common.Json.Converters
+{
+ ///
+ /// Converts a nullable struct or value to/from JSON.
+ /// Required - some clients send an empty string.
+ ///
+ /// The struct type.
+ public class JsonNullableStructConverter : JsonConverter
+ where T : struct
+ {
+ private readonly JsonConverter _baseJsonConverter;
+
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ /// The base json converter.
+ public JsonNullableStructConverter(JsonConverter baseJsonConverter)
+ {
+ _baseJsonConverter = baseJsonConverter;
+ }
+
+ ///
+ public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+ {
+ // Handle empty string.
+ if (reader.TokenType == JsonTokenType.String && ((reader.HasValueSequence && reader.ValueSequence.IsEmpty) || reader.ValueSpan.IsEmpty))
+ {
+ return null;
+ }
+
+ return _baseJsonConverter.Read(ref reader, typeToConvert, options);
+ }
+
+ ///
+ public override void Write(Utf8JsonWriter writer, T? value, JsonSerializerOptions options)
+ {
+ _baseJsonConverter.Write(writer, value, options);
+ }
+ }
+}
diff --git a/MediaBrowser.Common/Json/JsonDefaults.cs b/MediaBrowser.Common/Json/JsonDefaults.cs
index 9d30927dbb..5867cd4a0c 100644
--- a/MediaBrowser.Common/Json/JsonDefaults.cs
+++ b/MediaBrowser.Common/Json/JsonDefaults.cs
@@ -29,8 +29,14 @@ namespace MediaBrowser.Common.Json
NumberHandling = JsonNumberHandling.AllowReadingFromString
};
+ // Get built-in converters for fallback converting.
+ var baseNullableInt32Converter = (JsonConverter)options.GetConverter(typeof(int?));
+ var baseNullableInt64Converter = (JsonConverter)options.GetConverter(typeof(long?));
+
options.Converters.Add(new JsonGuidConverter());
options.Converters.Add(new JsonStringEnumConverter());
+ options.Converters.Add(new JsonNullableStructConverter(baseNullableInt32Converter));
+ options.Converters.Add(new JsonNullableStructConverter(baseNullableInt64Converter));
return options;
}