diff --git a/src/ServiceControl.Audit.UnitTests/ApprovalFiles/APIApprovals.PlatformSampleSettings.approved.txt b/src/ServiceControl.Audit.UnitTests/ApprovalFiles/APIApprovals.PlatformSampleSettings.approved.txt
index 7ca0b549c0..914aa55f6c 100644
--- a/src/ServiceControl.Audit.UnitTests/ApprovalFiles/APIApprovals.PlatformSampleSettings.approved.txt
+++ b/src/ServiceControl.Audit.UnitTests/ApprovalFiles/APIApprovals.PlatformSampleSettings.approved.txt
@@ -1,16 +1,5 @@
 {
-  "OnMessage": {
-    "Method": {
-      "Name": "<.ctor>b__0_0",
-      "AssemblyName": "ServiceControl.Audit, Version=4.0.0.0, Culture=neutral, PublicKeyToken=null",
-      "ClassName": "ServiceControl.Audit.Infrastructure.Settings.Settings+<>c",
-      "Signature": "System.Threading.Tasks.Task <.ctor>b__0_0(System.String, System.Collections.Generic.Dictionary`2[System.String,System.String], Byte[], System.Func`1[System.Threading.Tasks.Task])",
-      "Signature2": "System.Threading.Tasks.Task <.ctor>b__0_0(System.String, System.Collections.Generic.Dictionary`2[[System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089],[System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]], System.Byte[], System.Func`1[[System.Threading.Tasks.Task, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]])",
-      "MemberType": 8,
-      "GenericArguments": null
-    },
-    "Target": {}
-  },
+  "MessageFilter": null,
   "RunInMemory": false,
   "ValidateConfiguration": true,
   "DisableRavenDBPerformanceCounters": true,
diff --git a/src/ServiceControl.Audit.UnitTests/ApprovalFiles/APIApprovals.PublicClr.approved.txt b/src/ServiceControl.Audit.UnitTests/ApprovalFiles/APIApprovals.PublicClr.approved.txt
index 25e7f66626..99458c9511 100644
--- a/src/ServiceControl.Audit.UnitTests/ApprovalFiles/APIApprovals.PublicClr.approved.txt
+++ b/src/ServiceControl.Audit.UnitTests/ApprovalFiles/APIApprovals.PublicClr.approved.txt
@@ -187,7 +187,7 @@ namespace ServiceControl.Audit.Infrastructure.Settings
         public string LicenseFileText { get; set; }
         public int MaxBodySizeToStore { get; set; }
         public int MaximumConcurrencyLevel { get; set; }
-        public System.Func<string, System.Collections.Generic.Dictionary<string, string>, byte[], System.Func<System.Threading.Tasks.Task>, System.Threading.Tasks.Task> OnMessage { get; set; }
+        public System.Func<NServiceBus.Transport.MessageContext, bool> MessageFilter { get; set; }
         public int Port { get; set; }
         public bool PrintMetrics { get; }
         public string RootUrl { get; }
diff --git a/src/ServiceControl.UnitTests/ApprovalFiles/APIApprovals.PlatformSampleSettings.approved.txt b/src/ServiceControl.UnitTests/ApprovalFiles/APIApprovals.PlatformSampleSettings.approved.txt
index ee5ead1e4b..ea64ffed18 100644
--- a/src/ServiceControl.UnitTests/ApprovalFiles/APIApprovals.PlatformSampleSettings.approved.txt
+++ b/src/ServiceControl.UnitTests/ApprovalFiles/APIApprovals.PlatformSampleSettings.approved.txt
@@ -1,18 +1,7 @@
 {
   "NotificationsFilter": null,
   "AllowMessageEditing": false,
-  "OnMessage": {
-    "Method": {
-      "Name": "<.ctor>b__0_0",
-      "AssemblyName": "ServiceControl, Version=4.0.0.0, Culture=neutral, PublicKeyToken=null",
-      "ClassName": "ServiceBus.Management.Infrastructure.Settings.Settings+<>c",
-      "Signature": "System.Threading.Tasks.Task <.ctor>b__0_0(System.String, System.Collections.Generic.Dictionary`2[System.String,System.String], Byte[], System.Func`1[System.Threading.Tasks.Task])",
-      "Signature2": "System.Threading.Tasks.Task <.ctor>b__0_0(System.String, System.Collections.Generic.Dictionary`2[[System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089],[System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]], System.Byte[], System.Func`1[[System.Threading.Tasks.Task, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]])",
-      "MemberType": 8,
-      "GenericArguments": null
-    },
-    "Target": {}
-  },
+  "MessageFilter": null,
   "RunInMemory": false,
   "EmailDropFolder": null,
   "ValidateConfiguration": true,
diff --git a/src/ServiceControl.UnitTests/ApprovalFiles/APIApprovals.PublicClr.approved.txt b/src/ServiceControl.UnitTests/ApprovalFiles/APIApprovals.PublicClr.approved.txt
index 79bb5f6799..4e3640ef17 100644
--- a/src/ServiceControl.UnitTests/ApprovalFiles/APIApprovals.PublicClr.approved.txt
+++ b/src/ServiceControl.UnitTests/ApprovalFiles/APIApprovals.PublicClr.approved.txt
@@ -72,8 +72,8 @@ namespace ServiceBus.Management.Infrastructure.Settings
         public bool IngestErrorMessages { get; set; }
         public string LicenseFileText { get; set; }
         public int MaximumConcurrencyLevel { get; set; }
+        public System.Func<NServiceBus.Transport.MessageContext, bool> MessageFilter { get; set; }
         public string NotificationsFilter { get; set; }
-        public System.Func<string, System.Collections.Generic.Dictionary<string, string>, byte[], System.Func<System.Threading.Tasks.Task>, System.Threading.Tasks.Task> OnMessage { get; set; }
         public int Port { get; set; }
         public bool PrintMetrics { get; }
         public System.TimeSpan ProcessRetryBatchesFrequency { get; set; }