diff --git a/src/NzbDrone.Core/ThingiProvider/ProviderRepository.cs b/src/NzbDrone.Core/ThingiProvider/ProviderRepository.cs
index 66bbe559a..71e134ca8 100644
--- a/src/NzbDrone.Core/ThingiProvider/ProviderRepository.cs
+++ b/src/NzbDrone.Core/ThingiProvider/ProviderRepository.cs
@@ -1,9 +1,11 @@
 using System.Collections.Generic;
 using System.Text.Json;
+using System.Text.Json.Serialization;
 using Dapper;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Reflection;
 using NzbDrone.Core.Datastore;
+using NzbDrone.Core.Datastore.Converters;
 using NzbDrone.Core.Messaging.Events;
 
 namespace NzbDrone.Core.ThingiProvider
@@ -11,9 +13,26 @@ namespace NzbDrone.Core.ThingiProvider
     public class ProviderRepository<TProviderDefinition> : BasicRepository<TProviderDefinition>, IProviderRepository<TProviderDefinition>
         where TProviderDefinition : ProviderDefinition, new()
     {
+        protected readonly JsonSerializerOptions _serializerSettings;
+
         protected ProviderRepository(IMainDatabase database, IEventAggregator eventAggregator)
             : base(database, eventAggregator)
         {
+            var serializerSettings = new JsonSerializerOptions
+            {
+                AllowTrailingCommas = true,
+                IgnoreNullValues = true,
+                PropertyNameCaseInsensitive = true,
+                DictionaryKeyPolicy = JsonNamingPolicy.CamelCase,
+                PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+                WriteIndented = true
+            };
+
+            serializerSettings.Converters.Add(new JsonStringEnumConverter(JsonNamingPolicy.CamelCase, true));
+            serializerSettings.Converters.Add(new TimeSpanConverter());
+            serializerSettings.Converters.Add(new UtcConverter());
+
+            _serializerSettings = serializerSettings;
         }
 
         protected override List<TProviderDefinition> Query(SqlBuilder builder)
@@ -28,7 +47,6 @@ protected override List<TProviderDefinition> Query(SqlBuilder builder)
             {
                 var parser = reader.GetRowParser<TProviderDefinition>(typeof(TProviderDefinition));
                 var settingsIndex = reader.GetOrdinal(nameof(ProviderDefinition.Settings));
-                var serializerSettings = new JsonSerializerOptions { PropertyNameCaseInsensitive = true };
 
                 while (reader.Read())
                 {
@@ -42,7 +60,7 @@ protected override List<TProviderDefinition> Query(SqlBuilder builder)
                     }
                     else
                     {
-                        item.Settings = (IProviderConfig)JsonSerializer.Deserialize(body, impType, serializerSettings);
+                        item.Settings = (IProviderConfig)JsonSerializer.Deserialize(body, impType, _serializerSettings);
                     }
 
                     results.Add(item);