diff --git a/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs b/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
index 3a3354b322..1ea08e3118 100644
--- a/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
+++ b/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
@@ -333,11 +333,6 @@ namespace Umbraco.Core.Runtime
             composition.RegisterUnique<HtmlImageSourceParser>();
             composition.RegisterUnique<RichTextEditorPastedImages>();
 
-            // we should stop injecting UmbracoContext and always inject IUmbracoContextAccessor, however at the moment
-            // there are tons of places (controllers...) which require UmbracoContext in their ctor - so let's register
-            // a way to inject the UmbracoContext - DO NOT register this as Lifetime.Request since LI will dispose the context
-            // in it's own way but we don't want that to happen, we manage its lifetime ourselves.
-            composition.Register(factory => factory.GetInstance<IUmbracoContextAccessor>().UmbracoContext);
             composition.RegisterUnique<IUmbracoTreeSearcherFields, UmbracoTreeSearcherFields>();
             composition.Register<IPublishedContentQuery>(factory =>
             {
diff --git a/src/Umbraco.Tests/Web/Mvc/RenderNoContentControllerTests.cs b/src/Umbraco.Tests/Web/Mvc/RenderNoContentControllerTests.cs
index e728d75dc5..d33ce3bfcc 100644
--- a/src/Umbraco.Tests/Web/Mvc/RenderNoContentControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/RenderNoContentControllerTests.cs
@@ -3,6 +3,7 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
+using Umbraco.Tests.Common;
 using Umbraco.Web;
 using Umbraco.Web.Models;
 using Umbraco.Web.Mvc;
@@ -15,11 +16,12 @@ namespace Umbraco.Tests.Web.Mvc
         [Test]
         public void Redirects_To_Root_When_Content_Published()
         {
+
             var mockUmbracoContext = new Mock<IUmbracoContext>();
             mockUmbracoContext.Setup(x => x.Content.HasContent()).Returns(true);
             var mockIOHelper = new Mock<IIOHelper>();
             var mockGlobalSettings = new Mock<IGlobalSettings>();
-            var controller = new RenderNoContentController(mockUmbracoContext.Object, mockIOHelper.Object, mockGlobalSettings.Object);
+            var controller = new RenderNoContentController(new TestUmbracoContextAccessor(mockUmbracoContext.Object), mockIOHelper.Object, mockGlobalSettings.Object);
 
             var result = controller.Index() as RedirectResult;
 
@@ -40,7 +42,7 @@ namespace Umbraco.Tests.Web.Mvc
             var mockGlobalSettings = new Mock<IGlobalSettings>();
             mockGlobalSettings.SetupGet(x => x.UmbracoPath).Returns(UmbracoPathSetting);
             mockGlobalSettings.SetupGet(x => x.NoNodesViewPath).Returns(ViewPath);
-            var controller = new RenderNoContentController(mockUmbracoContext.Object, mockIOHelper.Object, mockGlobalSettings.Object);
+            var controller = new RenderNoContentController(new TestUmbracoContextAccessor(mockUmbracoContext.Object), mockIOHelper.Object, mockGlobalSettings.Object);
 
             var result = controller.Index() as ViewResult;
             Assert.IsNotNull(result);
diff --git a/src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs b/src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
index 0261b530ba..79c7d3ec25 100644
--- a/src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
+++ b/src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
@@ -42,9 +42,6 @@ namespace Umbraco.Web.Common.Runtime
             composition.RegisterUnique<ICookieManager, AspNetCoreCookieManager>();
 
             composition.RegisterMultipleUnique<ISessionIdResolver, ISessionManager, AspNetCoreSessionManager>();
-
-            composition.RegisterUnique<ISessionIdResolver, AspNetCoreSessionManager>();
-
         }
     }
 }
diff --git a/src/Umbraco.Web/Mvc/RenderNoContentController.cs b/src/Umbraco.Web/Mvc/RenderNoContentController.cs
index 2ffd323440..9334591fbb 100644
--- a/src/Umbraco.Web/Mvc/RenderNoContentController.cs
+++ b/src/Umbraco.Web/Mvc/RenderNoContentController.cs
@@ -8,20 +8,20 @@ namespace Umbraco.Web.Mvc
 {
     public class RenderNoContentController : Controller
     {
-        private readonly IUmbracoContext _umbracoContext;
+        private readonly IUmbracoContextAccessor _umbracoContextAccessor;
         private readonly IIOHelper _ioHelper;
         private readonly IGlobalSettings _globalSettings;
 
-        public RenderNoContentController(IUmbracoContext umbracoContext, IIOHelper ioHelper, IGlobalSettings globalSettings)
+        public RenderNoContentController(IUmbracoContextAccessor umbracoContextAccessor, IIOHelper ioHelper, IGlobalSettings globalSettings)
         {
-            _umbracoContext = umbracoContext ?? throw new ArgumentNullException(nameof(umbracoContext));
+            _umbracoContextAccessor = umbracoContextAccessor ?? throw new ArgumentNullException(nameof(umbracoContextAccessor));
             _ioHelper = ioHelper ?? throw new ArgumentNullException(nameof(ioHelper));
             _globalSettings = globalSettings ?? throw new ArgumentNullException(nameof(globalSettings));
         }
 
         public ActionResult Index()
         {
-            var store = _umbracoContext.Content;
+            var store = _umbracoContextAccessor.UmbracoContext.Content;
             if (store.HasContent())
             {
                 // If there is actually content, go to the root.