diff --git a/src/Umbraco.Web.Website/Controllers/UmbracoRenderingDefaultsOptions.cs b/src/Umbraco.Web.Website/Controllers/UmbracoRenderingDefaultsOptions.cs
index 120d0f6099..fb9f02d385 100644
--- a/src/Umbraco.Web.Website/Controllers/UmbracoRenderingDefaultsOptions.cs
+++ b/src/Umbraco.Web.Website/Controllers/UmbracoRenderingDefaultsOptions.cs
@@ -1,4 +1,5 @@
 using System;
+using Umbraco.Cms.Web.Common.Controllers;
 
 namespace Umbraco.Cms.Web.Website.Controllers
 {
@@ -10,6 +11,6 @@ namespace Umbraco.Cms.Web.Website.Controllers
         /// <summary>
         /// Gets the default umbraco render controller type
         /// </summary>
-        public Type DefaultControllerType { get; set; }
+        public Type DefaultControllerType { get; set; } = typeof(RenderController);
     }
 }
diff --git a/src/Umbraco.Web.Website/Controllers/UmbracoRenderingDefaultsOptionsSetup.cs b/src/Umbraco.Web.Website/Controllers/UmbracoRenderingDefaultsOptionsSetup.cs
deleted file mode 100644
index 22b970dc92..0000000000
--- a/src/Umbraco.Web.Website/Controllers/UmbracoRenderingDefaultsOptionsSetup.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Web.Common.Controllers;
-
-namespace Umbraco.Cms.Web.Website.Controllers
-{
-    public class UmbracoRenderingDefaultsOptionsSetup : IConfigureOptions<UmbracoRenderingDefaultsOptions>
-    {
-        //private IOptions<UmbracoRenderingDefaultsOptions> _umbracoRenderingDefaultOptions;
-
-        //public UmbracoRenderingDefaultsOptionsSetup(IOptions<UmbracoRenderingDefaultsOptions> umbracoRenderingDefaultOptions)
-        //{
-        //    _umbracoRenderingDefaultOptions = umbracoRenderingDefaultOptions;
-        //}
-
-        public void Configure(UmbracoRenderingDefaultsOptions options)
-        {
-            if (options == null)
-            {
-                throw new ArgumentNullException(nameof(options));
-            }
-
-            //options.DefaultControllerType = _umbracoRenderingDefaultOptions.Value.DefaultControllerType;
-
-            options.DefaultControllerType = typeof(RenderController);
-        }
-    }
-}
diff --git a/src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs
index 3f050e5ad1..098388df70 100644
--- a/src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs
+++ b/src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs
@@ -42,7 +42,7 @@ namespace Umbraco.Extensions
             builder.Services.AddSingleton<IUmbracoRouteValuesFactory, UmbracoRouteValuesFactory>();
 
             // Umbraco Rendering Defaults startup options to define which RenderController type to use
-            builder.Services.ConfigureOptions<UmbracoRenderingDefaultsOptionsSetup>();
+            builder.Services.ConfigureOptions<UmbracoRenderingDefaultsOptions>();
 
             builder.Services.AddSingleton<IRoutableDocumentFilter, RoutableDocumentFilter>();