diff --git a/SampleApplications/Samples/NetCoreConsolePublisher/Program.cs b/SampleApplications/Samples/NetCoreConsolePublisher/Program.cs
index 224ca57195..32f48456ec 100644
--- a/SampleApplications/Samples/NetCoreConsolePublisher/Program.cs
+++ b/SampleApplications/Samples/NetCoreConsolePublisher/Program.cs
@@ -217,6 +217,12 @@ namespace NetCoreConsolePublisher
 
                 JsonEncoder encoder = new JsonEncoder(
                     monitoredItem.Subscription.Session.MessageContext, false);
+                string hostname = monitoredItem.Subscription.Session.ConfiguredEndpoint.EndpointUrl.DnsSafeHost;
+                if (hostname == "localhost")
+                {
+                    hostname = Utils.GetHostName();
+                }
+                encoder.WriteString("HostName", hostname);
                 encoder.WriteNodeId("MonitoredItem", monitoredItem.ResolvedNodeId);
                 e.NotificationValue.Encode(encoder);