diff --git a/ElementX/Sources/Application/Settings/AppSettings.swift b/ElementX/Sources/Application/Settings/AppSettings.swift
index 7dac65522..7225e6c51 100644
--- a/ElementX/Sources/Application/Settings/AppSettings.swift
+++ b/ElementX/Sources/Application/Settings/AppSettings.swift
@@ -23,6 +23,7 @@ nonisolated protocol CommonSettingsProtocol: AnyObject, Sendable {
     var logLevel: LogLevel { get }
     var traceLogPacks: Set<TraceLogPack> { get }
     var bugReportRageshakeURL: RemotePreference<RageshakeConfiguration> { get }
+    var contentScannerURL: RemotePreference<URL?> { get }
     
     var enableOnlySignedDeviceIsolationMode: Bool { get }
     var threadsEnabled: Bool { get }
@@ -266,6 +267,12 @@ final nonisolated class AppSettings: @unchecked Sendable {
     /// The name allocated by the bug report server
     private(set) var bugReportApplicationID = "element-x-ios"
     
+    // MARK: - Content scanner
+    
+    /// The base URL of the content scanner server used to scan media before it is downloaded.
+    /// `nil` when content scanning is disabled.
+    let contentScannerURL: RemotePreference<URL?> = .init(nil)
+    
     // MARK: - Analytics
     
     /// The configuration to use for analytics. Set to `nil` to disable analytics.
diff --git a/Enterprise b/Enterprise
index bd9d5b94a..08f254401 160000
--- a/Enterprise
+++ b/Enterprise
@@ -1 +1 @@
-Subproject commit bd9d5b94a2d6b385ab3494006493d3079630537f
+Subproject commit 08f25440187a87981f120ddd6ff66a1195478596