diff --git a/src/Runner.Common/HostContext.cs b/src/Runner.Common/HostContext.cs
index 0b2ae0ae979..db0c54226ff 100644
--- a/src/Runner.Common/HostContext.cs
+++ b/src/Runner.Common/HostContext.cs
@@ -629,7 +629,7 @@ protected override void OnEventWritten(EventWrittenEventArgs eventData)
                     payload[0] = Enum.Parse(typeof(GitHub.Services.Common.VssCredentialsType), ((int)payload[0]).ToString());
                 }
 
-                if (payload.Length > 0)
+                if (payload.Length > 0 && !string.IsNullOrEmpty(eventData.Message))
                 {
                     message = String.Format(eventData.Message.Replace("%n", Environment.NewLine), payload);
                 }