diff --git a/src/Umbraco.Core/Profiling/StartupWebProfilerProvider.cs b/src/Umbraco.Core/Profiling/StartupWebProfilerProvider.cs
deleted file mode 100644
index 16ce638c0e..0000000000
--- a/src/Umbraco.Core/Profiling/StartupWebProfilerProvider.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-using System.Threading;
-using System.Web;
-using StackExchange.Profiling;
-
-namespace Umbraco.Core.Profiling
-{
-    /// <summary>
-    /// Allows us to profile items during app startup - before an HttpRequest is created
-    /// </summary>
-    internal class StartupWebProfilerProvider : WebRequestProfilerProvider
-    {
-        public StartupWebProfilerProvider()
-        {
-            _startupPhase = StartupPhase.Boot;
-            //create the startup profiler
-            _startupProfiler = new MiniProfiler("http://localhost/umbraco-startup", ProfileLevel.Verbose)
-            {
-                Name = "StartupProfiler"
-            };            
-        }
-
-        private MiniProfiler _startupProfiler;
-        private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim();
-
-        private enum StartupPhase
-        {
-            None = 0,
-            Boot = 1,
-            Request = 2
-        }
-
-        private volatile StartupPhase _startupPhase;
-
-        public void BootComplete()
-        {
-            using (new ReadLock(_locker))
-            {
-                if (_startupPhase != StartupPhase.Boot) return;
-            }
-
-            using (var l = new UpgradeableReadLock(_locker))
-            {
-                if (_startupPhase == StartupPhase.Boot)
-                {
-                    l.UpgradeToWriteLock();
-
-                    ////Now we need to transfer some information from our startup phase to the normal
-                    ////web request phase to output the startup profiled information.
-                    ////Stop our internal startup profiler, this will write out it's results to storage.
-                    //StopProfiler(_startupProfiler);
-                    //SaveProfiler(_startupProfiler);
-
-                    _startupPhase = StartupPhase.Request;
-                }
-            }
-        }        
-
-        public override void Stop(bool discardResults)
-        {
-            using (new ReadLock(_locker))
-            {
-                if (_startupPhase == StartupPhase.None)
-                {
-                    base.Stop(discardResults);
-                    return;
-                }
-            }
-
-            using (var l = new UpgradeableReadLock(_locker))
-            {
-                if (_startupPhase > 0 && base.GetCurrentProfiler() == null)
-                {
-                    l.UpgradeToWriteLock();
-
-                    _startupPhase = StartupPhase.None;                    
-
-                    if (HttpContext.Current != null)
-                    {
-                        HttpContext.Current.Items[":mini-profiler:"] = _startupProfiler;
-                        base.Stop(discardResults);
-                        _startupProfiler = null;
-                    }
-                }
-                else
-                {
-                    base.Stop(discardResults);
-                }
-            }
-        }
-
-        public override MiniProfiler Start(ProfileLevel level)
-        {
-            using (new ReadLock(_locker))
-            {
-                if (_startupPhase > 0 && base.GetCurrentProfiler() == null)
-                {
-                    SetProfilerActive(_startupProfiler);
-                    return _startupProfiler;
-                }
-
-                return base.Start(level);
-            }
-        }
-
-        public override MiniProfiler GetCurrentProfiler()
-        {
-            using (new ReadLock(_locker))
-            {
-                if (_startupPhase > 0)
-                {
-                    try
-                    {
-                        var current = base.GetCurrentProfiler();
-                        if (current == null) return _startupProfiler;
-                    }
-                    catch
-                    {
-                        return _startupProfiler;
-                    }
-                }
-
-                return base.GetCurrentProfiler();
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Profiling/WebProfiler.cs b/src/Umbraco.Core/Profiling/WebProfiler.cs
index 45d3a68591..00d088bca7 100644
--- a/src/Umbraco.Core/Profiling/WebProfiler.cs
+++ b/src/Umbraco.Core/Profiling/WebProfiler.cs
@@ -12,28 +12,16 @@ namespace Umbraco.Core.Profiling
     /// </summary>
     internal class WebProfiler : IProfiler
     {
-        private StartupWebProfilerProvider _startupWebProfilerProvider;
 
         /// <summary>
         /// Constructor
-        /// </summary>        
+        /// </summary>
+        /// <remarks>
+        /// Binds to application events to enable the MiniProfiler
+        /// </remarks>
         internal WebProfiler()
         {
-            if (GlobalSettings.DebugMode)
-            {
-                //setup some defaults
-                MiniProfiler.Settings.SqlFormatter = new SqlServerFormatter();
-                MiniProfiler.Settings.StackMaxLength = 5000;
-
-                //At this point we know that we've been constructed during app startup, there won't be an HttpRequest in the HttpContext 
-                // since it hasn't started yet. So we need to do some hacking to enable profiling during startup.
-                _startupWebProfilerProvider = new StartupWebProfilerProvider();
-                //this should always be the case during startup, we'll need to set a custom profiler provider
-                MiniProfiler.Settings.ProfilerProvider = _startupWebProfilerProvider;
-
-                //Binds to application events to enable the MiniProfiler with a real HttpRequest
-                UmbracoApplicationBase.ApplicationInit += UmbracoApplicationApplicationInit;
-            }
+            UmbracoApplicationBase.ApplicationInit += UmbracoApplicationApplicationInit;
         }
 
         /// <summary>
@@ -65,12 +53,7 @@ namespace Umbraco.Core.Profiling
         /// <param name="e"></param>
         void UmbracoApplicationEndRequest(object sender, EventArgs e)
         {
-            if (_startupWebProfilerProvider != null)
-            {
-                Stop();
-                _startupWebProfilerProvider = null;
-            }
-            else if (CanPerformProfilingAction(sender))
+            if (CanPerformProfilingAction(sender))
             {
                 Stop();
             }
@@ -83,11 +66,6 @@ namespace Umbraco.Core.Profiling
         /// <param name="e"></param>
         void UmbracoApplicationBeginRequest(object sender, EventArgs e)
         {
-            if (_startupWebProfilerProvider != null)
-            {
-                _startupWebProfilerProvider.BootComplete();
-            }
-
             if (CanPerformProfilingAction(sender))
             {
                 Start();
@@ -126,7 +104,7 @@ namespace Umbraco.Core.Profiling
         /// </remarks>
         public string Render()
         {
-            return GlobalSettings.DebugMode ? MiniProfiler.RenderIncludes(RenderPosition.Right).ToString() : string.Empty;
+            return MiniProfiler.RenderIncludes(RenderPosition.Right).ToString();
         }
 
         /// <summary>
@@ -147,10 +125,9 @@ namespace Umbraco.Core.Profiling
         /// </summary>
         public void Start()
         {
-            if (GlobalSettings.DebugMode)
-            {
-                MiniProfiler.Start();
-            }
+            MiniProfiler.Settings.SqlFormatter = new SqlServerFormatter();
+            MiniProfiler.Settings.StackMaxLength = 5000;
+            MiniProfiler.Start();
         }
 
         /// <summary>
@@ -162,10 +139,7 @@ namespace Umbraco.Core.Profiling
         /// </remarks>
         public void Stop(bool discardResults = false)
         {
-            if (GlobalSettings.DebugMode)
-            {
-                MiniProfiler.Stop(discardResults);
-            }
+            MiniProfiler.Stop(discardResults);
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index d11270592a..2ef0501f8e 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -469,7 +469,6 @@
     <Compile Include="Persistence\Repositories\PublicAccessRepository.cs" />
     <Compile Include="Persistence\Repositories\TaskRepository.cs" />
     <Compile Include="Persistence\Repositories\TaskTypeRepository.cs" />
-    <Compile Include="Profiling\StartupWebProfilerProvider.cs" />
     <Compile Include="PropertyEditors\ValueConverters\GridValueConverter.cs" />
     <Compile Include="Publishing\UnPublishedStatusType.cs" />
     <Compile Include="Publishing\UnPublishStatus.cs" />