diff --git a/src/Umbraco.Core/Components/CompositionExtensions.cs b/src/Umbraco.Core/Components/CompositionExtensions.cs
index 1bbb3faff0..abc0fa3862 100644
--- a/src/Umbraco.Core/Components/CompositionExtensions.cs
+++ b/src/Umbraco.Core/Components/CompositionExtensions.cs
@@ -172,23 +172,16 @@ namespace Umbraco.Core.Components
             composition.Container.RegisterSingleton(_ => registrar);
         }
 
-
-        // review since only one is called in the core for now, I remove this
-        // it allows us to wrap the factory to "allow re-registration".
-        ///// <summary>
-        ///// Sets the server messenger.
-        ///// </summary>
-        ///// <typeparam name="T">The type of the server registrar.</typeparam>
-        ///// <param name="composition">The composition.</param>
-        //public static void SetServerMessenger<T>(this Composition composition)
-        //    where T : IServerMessenger
-        //{
-        //    composition.Container.Register<IServerMessenger, T>(Lifetime.Singleton);
-        //}
-
-        private static Func<IContainer, IServerMessenger> serverMessengerFactory = null;
-        private static bool serverMessengerIsRegistered = false;
-        private static Func<IContainer, IServerMessenger> wrappedServerMessengerFactory = c => serverMessengerFactory(c);
+        /// <summary>
+        /// Sets the server messenger.
+        /// </summary>
+        /// <typeparam name="T">The type of the server registrar.</typeparam>
+        /// <param name="composition">The composition.</param>
+        public static void SetServerMessenger<T>(this Composition composition)
+            where T : IServerMessenger
+        {
+            composition.Container.Register<IServerMessenger, T>(Lifetime.Singleton);
+        }
 
         /// <summary>
         /// Sets the server messenger.
@@ -197,13 +190,7 @@ namespace Umbraco.Core.Components
         /// <param name="factory">A function creating a server messenger.</param>
         public static void SetServerMessenger(this Composition composition, Func<IContainer, IServerMessenger> factory)
         {
-            if (!serverMessengerIsRegistered)
-            {
-                serverMessengerIsRegistered = true;
-                composition.Container.RegisterSingleton(wrappedServerMessengerFactory);
-            }
-
-            serverMessengerFactory = factory;
+            composition.Container.RegisterSingleton(factory);
         }
 
         /// <summary>
@@ -213,13 +200,7 @@ namespace Umbraco.Core.Components
         /// <param name="registrar">A server messenger.</param>
         public static void SetServerMessenger(this Composition composition, IServerMessenger registrar)
         {
-            if (!serverMessengerIsRegistered)
-            {
-                serverMessengerIsRegistered = true;
-                composition.Container.RegisterSingleton(wrappedServerMessengerFactory);
-            }
-
-            serverMessengerFactory = c => registrar;
+            composition.Container.RegisterSingleton(_ => registrar);
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/Runtime/CoreRuntimeComponent.cs b/src/Umbraco.Core/Runtime/CoreRuntimeComponent.cs
index ae9955706c..9d7c3e5a6a 100644
--- a/src/Umbraco.Core/Runtime/CoreRuntimeComponent.cs
+++ b/src/Umbraco.Core/Runtime/CoreRuntimeComponent.cs
@@ -74,8 +74,7 @@ namespace Umbraco.Core.Runtime
             // by default we'll use the database server messenger with default options (no callbacks),
             // this will be overridden by either the legacy thing or the db thing in the corresponding
             // components in the web project - fixme - should obsolete the legacy thing
-            composition.SetServerMessenger(
-                factory
+            composition.Container.RegisterSingleton<IServerMessenger>(factory
                 => new DatabaseServerMessenger(
                     factory.GetInstance<IRuntimeState>(),
                     factory.GetInstance<IScopeProvider>(),