diff --git a/src/Orchard.Web/Modules/Orchard.MessageBus/Services/DefaultMessageBus.cs b/src/Orchard.Web/Modules/Orchard.MessageBus/Services/DefaultMessageBus.cs
index e38098db8..9265fdc6b 100644
--- a/src/Orchard.Web/Modules/Orchard.MessageBus/Services/DefaultMessageBus.cs
+++ b/src/Orchard.Web/Modules/Orchard.MessageBus/Services/DefaultMessageBus.cs
@@ -1,15 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
-using System.Threading.Tasks;
 using Orchard.Logging;
 
 namespace Orchard.MessageBus.Services {
     public class DefaultMessageBus : IMessageBus {
         private readonly IMessageBroker _messageBroker;
+        private readonly IHostNameProvider _hostNameProvider;
 
-        public DefaultMessageBus(IEnumerable<IMessageBroker> messageBrokers) {
+        public DefaultMessageBus(IEnumerable<IMessageBroker> messageBrokers, IHostNameProvider hostNameProvider) {
+            _hostNameProvider = hostNameProvider;
             _messageBroker = messageBrokers.FirstOrDefault();
 
             Logger = NullLogger.Instance;
@@ -23,7 +23,7 @@ namespace Orchard.MessageBus.Services {
             }
 
             _messageBroker.Subscribe(channel, handler);
-            Logger.Debug("{0} subscribed to {1}", GetHostName(), channel);
+            Logger.Debug("{0} subscribed to {1}", _hostNameProvider.GetHostName(), channel);
         }
 
         public void Publish(string channel, string message) {
@@ -32,12 +32,7 @@ namespace Orchard.MessageBus.Services {
             }
 
             _messageBroker.Publish(channel, message);
-            Logger.Debug("{0} published {1}", GetHostName(), channel);
-        }
-
-        private string GetHostName() {
-            // use the current host and the process id as two servers could run on the same machine
-            return System.Net.Dns.GetHostName() + ":" + System.Diagnostics.Process.GetCurrentProcess().Id;
+            Logger.Debug("{0} published {1}", _hostNameProvider.GetHostName(), channel);
         }
     }
 }
\ No newline at end of file