diff --git a/msbuild/Directory.Build.props b/msbuild/Directory.Build.props
index 59303c3b89..e844dec951 100644
--- a/msbuild/Directory.Build.props
+++ b/msbuild/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
-		<MessagingVersion>1.4.4</MessagingVersion>
+		<MessagingVersion>1.4.7</MessagingVersion>
 		<HotRestartVersion>1.0.82</HotRestartVersion>
 	</PropertyGroup>
 </Project>
diff --git a/msbuild/Messaging/Xamarin.Messaging.Build/BuildAgent.cs b/msbuild/Messaging/Xamarin.Messaging.Build/BuildAgent.cs
index 59c8fbce3e..65d7475af7 100644
--- a/msbuild/Messaging/Xamarin.Messaging.Build/BuildAgent.cs
+++ b/msbuild/Messaging/Xamarin.Messaging.Build/BuildAgent.cs
@@ -6,13 +6,17 @@ using Xamarin.Messaging.Client;
 
 namespace Xamarin.Messaging.Build {
 	public class BuildAgent : Agent {
+		readonly AgentInfo buildAgentInfo;
+
 		public BuildAgent (ITopicGenerator topicGenerator, string version = null, string versionInfo = null) : base (topicGenerator)
 		{
+			buildAgentInfo = new BuildAgentInfo ();
+
 			Version = string.IsNullOrEmpty (version) ? GetVersion () : version;
 			VersionInfo = string.IsNullOrEmpty (versionInfo) ? GetInformationalVersion () : versionInfo;
 		}
 
-		public override string Name => BuildAgentInfo.Instance.Name;
+		public override string Name => buildAgentInfo.Name;
 
 		public override string Version { get; }