diff --git a/changelogs/7.0.asciidoc b/changelogs/7.0.asciidoc
index 157d64348e1..8d42ac99c75 100644
--- a/changelogs/7.0.asciidoc
+++ b/changelogs/7.0.asciidoc
@@ -15,6 +15,7 @@
 ==== Bugfix
 
 - Ensure setup cmd uses expected configuration {pull}1934[1934]. 
+- Ensure host.name is not added {pull}1934[1934].
 
 ////
 
diff --git a/publish/pub.go b/publish/pub.go
index f0086d7ae3e..b663f2ec24b 100644
--- a/publish/pub.go
+++ b/publish/pub.go
@@ -80,6 +80,7 @@ func NewPublisher(info beat.Info, pipeline beat.Pipeline, shutdownTimeout time.D
 		},
 		SkipAgentMetadata: true,
 		SkipNormalization: true,
+		SkipHostName:      true,
 	})
 	if err != nil {
 		return nil, err
diff --git a/tests/system/test_integration.py b/tests/system/test_integration.py
index 80d12f36fc1..fa96dbdb95d 100644
--- a/tests/system/test_integration.py
+++ b/tests/system/test_integration.py
@@ -122,10 +122,6 @@ def check_docs(self, approved, received, doc_type):
                 if rec_id == appr[doc_type]['id']:
                     checked = True
                     for k, v in rec.items():
-                        if k == "host":
-                            # TODO: fix https://github.com/elastic/apm-server/issues/1846
-                            #  then remove this exception handling and treat as other keys
-                            continue
                         if k == "observer":
                             expected = Set(["hostname", "version", "id", "ephemeral_id", "type", "version_major"])
                             rec_keys = Set(v.keys())