diff --git a/Beam/go/go.mod b/Beam/go/go.mod
index b35dd879b..3d7fe8e37 100644
--- a/Beam/go/go.mod
+++ b/Beam/go/go.mod
@@ -91,3 +91,5 @@ require (
 	gopkg.in/jcmturner/rpc.v1 v1.1.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
+
+replace github.com/olivere/elastic/v7 => github.com/rootpd/elastic/v7 v7.0.0-20240911082621-bad91d4bff6b
diff --git a/Beam/go/go.sum b/Beam/go/go.sum
index f8c5705c9..d830f7698 100644
--- a/Beam/go/go.sum
+++ b/Beam/go/go.sum
@@ -195,6 +195,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a h1:9ZKAASQSHhDYGoxY8uLVpewe1GDZ2vu2Tr/vTdVAkFQ=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
+github.com/rootpd/elastic/v7 v7.0.0-20240911082621-bad91d4bff6b h1:5RnWc/4vC8lLdxtlke9bAY3RB+/hxi7J9mMXlnl7tq8=
+github.com/rootpd/elastic/v7 v7.0.0-20240911082621-bad91d4bff6b/go.mod h1:c7PVmLe3Fxq77PIfY/bZmxY/TAamBhCzZ8xDOE09a9k=
 github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
 github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
 github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM=
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6be172aa9..4de9c7c8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 `### [Beam]
 
-- [Tracker] Fixed Tracker not publishing messages to pub sub due to prematurely closed client. remp/remp#1384
+- [Tracker] Fixed Tracker not publishing messages to pub/sub due to prematurely closed client. remp/remp#1384
+- [Segments] Fixed Elasticsearch 8 incompatibility in mapping caching. remp/remp#1385
 
 ### [Mailer]