diff --git a/src/Umbraco.Core/CoreBootManager.cs b/src/Umbraco.Core/CoreBootManager.cs
index eb57c41354..add9b65fce 100644
--- a/src/Umbraco.Core/CoreBootManager.cs
+++ b/src/Umbraco.Core/CoreBootManager.cs
@@ -219,9 +219,6 @@ namespace Umbraco.Core
             // we're ready to serve content!
             ApplicationContext.IsReady = true;
 
-            //And now we can dispose of our startup handlers - save some memory
-            ApplicationEventsResolver.Current.Dispose();
-
 			return this;
 		}
 
diff --git a/src/Umbraco.Core/UmbracoApplicationBase.cs b/src/Umbraco.Core/UmbracoApplicationBase.cs
index dd6c3a8103..c861eca6cd 100644
--- a/src/Umbraco.Core/UmbracoApplicationBase.cs
+++ b/src/Umbraco.Core/UmbracoApplicationBase.cs
@@ -5,6 +5,7 @@ using System.Web.Mvc;
 using StackExchange.Profiling;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
+using Umbraco.Core.ObjectResolution;
 
 namespace Umbraco.Core
 {
@@ -40,6 +41,9 @@ namespace Umbraco.Core
                 .Initialize()
                 .Startup(appContext => OnApplicationStarting(sender, e))
                 .Complete(appContext => OnApplicationStarted(sender, e));
+
+            //And now we can dispose of our startup handlers - save some memory
+            ApplicationEventsResolver.Current.Dispose();
         }
 
         /// <summary>