diff --git a/server/src/main/java/org/elasticsearch/TransportVersion.java b/server/src/main/java/org/elasticsearch/TransportVersion.java
index 5f31b94bdabc2..f1e20ac4bb77e 100644
--- a/server/src/main/java/org/elasticsearch/TransportVersion.java
+++ b/server/src/main/java/org/elasticsearch/TransportVersion.java
@@ -131,7 +131,7 @@ public boolean isKnown() {
      *         there are no such versions.
      */
     public TransportVersion bestKnownVersion() {
-        if (VersionsHolder.ALL_VERSIONS_MAP.containsKey(id)) {
+        if (isKnown()) {
             return this;
         }
         TransportVersion bestSoFar = TransportVersions.ZERO;