diff --git a/go.mod b/go.mod
index 212cf1a69..46a68f749 100644
--- a/go.mod
+++ b/go.mod
@@ -77,7 +77,7 @@ require (
 	github.com/docker/go-connections v0.5.0
 	github.com/dustin/go-humanize v1.0.1
 	github.com/dynatrace-oss/dynatrace-metric-utils-go v0.5.0
-	github.com/eclipse/paho.golang v0.21.0
+	github.com/eclipse/paho.golang v0.22.0
 	github.com/eclipse/paho.mqtt.golang v1.5.0
 	github.com/facebook/time v0.0.0-20240626113945-18207c5d8ddc
 	github.com/fatih/color v1.18.0
diff --git a/go.sum b/go.sum
index a8b03001c..92f7e7c6d 100644
--- a/go.sum
+++ b/go.sum
@@ -1154,8 +1154,8 @@ github.com/echlebek/crock v1.0.1 h1:KbzamClMIfVIkkjq/GTXf+N16KylYBpiaTitO3f1ujg=
 github.com/echlebek/crock v1.0.1/go.mod h1:/kvwHRX3ZXHj/kHWJkjXDmzzRow54EJuHtQ/PapL/HI=
 github.com/echlebek/timeproxy v1.0.0 h1:V41/v8tmmMDNMA2GrBPI45nlXb3F7+OY+nJz1BqKsCk=
 github.com/echlebek/timeproxy v1.0.0/go.mod h1:0dg2Lnb8no/jFwoMQKMTU6iAivgoMptGqSTprhnrRtk=
-github.com/eclipse/paho.golang v0.21.0 h1:cxxEReu+iFbA5RrHfRGxJOh8tXZKDywuehneoeBeyn8=
-github.com/eclipse/paho.golang v0.21.0/go.mod h1:GHF6vy7SvDbDHBguaUpfuBkEB5G6j0zKxMG4gbh6QRQ=
+github.com/eclipse/paho.golang v0.22.0 h1:JhhUngr8TBlyUZDZw/L6WVayPi9qmSmdWeki48i5AVE=
+github.com/eclipse/paho.golang v0.22.0/go.mod h1:9ZiYJ93iEfGRJri8tErNeStPKLXIGBHiqbHV74t5pqI=
 github.com/eclipse/paho.mqtt.golang v1.5.0 h1:EH+bUVJNgttidWFkLLVKaQPGmkTUfQQqjOsyvMGvD6o=
 github.com/eclipse/paho.mqtt.golang v1.5.0/go.mod h1:du/2qNQVqJf/Sqs4MEL77kR8QTqANF7XU7Fk0aOTAgk=
 github.com/emersion/go-message v0.18.0 h1:7LxAXHRpSeoO/Wom3ZApVZYG7c3d17yCScYce8WiXA8=
diff --git a/plugins/common/mqtt/mqtt_v5.go b/plugins/common/mqtt/mqtt_v5.go
index d744625f7..f41e84b6a 100644
--- a/plugins/common/mqtt/mqtt_v5.go
+++ b/plugins/common/mqtt/mqtt_v5.go
@@ -32,9 +32,9 @@ func NewMQTTv5Client(cfg *MqttConfig) (*mqttv5Client, error) {
 		KeepAlive:      uint16(cfg.KeepAlive),
 		OnConnectError: cfg.OnConnectionLost,
 	}
-	opts.ConnectPacketBuilder = func(c *mqttv5.Connect, _ *url.URL) *mqttv5.Connect {
+	opts.ConnectPacketBuilder = func(c *mqttv5.Connect, _ *url.URL) (*mqttv5.Connect, error) {
 		c.CleanStart = cfg.PersistentSession
-		return c
+		return c, nil
 	}
 
 	if time.Duration(cfg.ConnectionTimeout) >= 1*time.Second {