diff --git a/driver/src/main/java/org/neo4j/driver/internal/util/DriverInfoUtil.java b/driver/src/main/java/org/neo4j/driver/internal/util/DriverInfoUtil.java
index b265db6814..30c31896e6 100644
--- a/driver/src/main/java/org/neo4j/driver/internal/util/DriverInfoUtil.java
+++ b/driver/src/main/java/org/neo4j/driver/internal/util/DriverInfoUtil.java
@@ -45,7 +45,7 @@ public static BoltAgent boltAgent() {
                 productInfo,
                 platformBuilder.isEmpty() ? null : platformBuilder.toString(),
                 language.orElse(null),
-                languageDetails.isEmpty() ? null : languageDetails.toString());
+                languageDetails.map(StringBuilder::toString).orElse(null));
     }
 
     /**