diff --git a/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs b/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs
index eacd615830..c4a95d45e5 100644
--- a/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs
+++ b/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs
@@ -263,6 +263,9 @@ namespace Umbraco.Cms.Core.DependencyInjection
 
             // Register telemetry service used to gather data about installed packages
             Services.AddUnique<ITelemetryService, TelemetryService>();
+
+            // Register a noop IHtmlSanitizer to be replaced
+            Services.AddUnique<IHtmlSanitizer, NoopHtmlSanitizer>();
         }
     }
 }
diff --git a/src/Umbraco.Core/Security/NoOpHtmlSanitizer.cs b/src/Umbraco.Core/Security/NoopHtmlSanitizer.cs
similarity index 73%
rename from src/Umbraco.Core/Security/NoOpHtmlSanitizer.cs
rename to src/Umbraco.Core/Security/NoopHtmlSanitizer.cs
index f2e8a48ad0..2ada23631a 100644
--- a/src/Umbraco.Core/Security/NoOpHtmlSanitizer.cs
+++ b/src/Umbraco.Core/Security/NoopHtmlSanitizer.cs
@@ -1,6 +1,6 @@
 namespace Umbraco.Cms.Core.Security
 {
-    public class NoOpHtmlSanitizer : IHtmlSanitizer
+    public class NoopHtmlSanitizer : IHtmlSanitizer
     {
         public string Sanitize(string html)
         {