diff --git a/src/ServiceControl.Audit/Infrastructure/Bootstrapper.cs b/src/ServiceControl.Audit/Infrastructure/Bootstrapper.cs
index 903fc0eee0..ad21199d6d 100644
--- a/src/ServiceControl.Audit/Infrastructure/Bootstrapper.cs
+++ b/src/ServiceControl.Audit/Infrastructure/Bootstrapper.cs
@@ -190,22 +190,7 @@ void RecordStartup(LoggingSettings loggingSettings, EndpointConfiguration endpoi
             logger.Info(startupMessage);
             endpointConfiguration.GetSettings().AddStartupDiagnosticsSection("Startup", new
             {
-                Settings = new
-                {
-                    settings.ApiUrl,
-                    settings.AuditLogQueue,
-                    settings.AuditQueue,
-                    settings.DataSpaceRemainingThreshold,
-                    settings.ForwardAuditMessages,
-                    settings.HttpDefaultConnectionLimit,
-                    settings.IngestAuditMessages,
-                    settings.MaxBodySizeToStore,
-                    settings.MaximumConcurrencyLevel,
-                    settings.Port,
-                    settings.SkipQueueCreation,
-                    settings.EnableFullTextSearchOnBodies,
-                    settings.TransportType
-                },
+                Settings = settings,
                 LoggingSettings = loggingSettings
             });
         }
diff --git a/src/ServiceControl/Bootstrapper.cs b/src/ServiceControl/Bootstrapper.cs
index 7296120b12..1c790fcdc5 100644
--- a/src/ServiceControl/Bootstrapper.cs
+++ b/src/ServiceControl/Bootstrapper.cs
@@ -158,27 +158,7 @@ Audit Retention Period (optional):  {settings.AuditRetentionPeriod}
             logger.Info(startupMessage);
             endpointConfiguration.GetSettings().AddStartupDiagnosticsSection("Startup", new
             {
-                Settings = new
-                {
-                    settings.ApiUrl,
-                    settings.ErrorLogQueue,
-                    settings.DataSpaceRemainingThreshold,
-                    settings.ErrorQueue,
-                    settings.ForwardErrorMessages,
-                    settings.HttpDefaultConnectionLimit,
-                    settings.IngestErrorMessages,
-                    settings.MaximumConcurrencyLevel,
-                    settings.Port,
-                    settings.ProcessRetryBatchesFrequency,
-                    settings.NotificationsFilter,
-                    settings.RemoteInstances,
-                    settings.RetryHistoryDepth,
-                    settings.PersisterSpecificSettings,
-                    settings.SkipQueueCreation,
-                    settings.PersisterSpecificSettings.EnableFullTextSearchOnBodies,
-                    settings.TransportType,
-                    settings.AllowMessageEditing,
-                },
+                Settings = settings,
                 LoggingSettings = loggingSettings
             });
         }