diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index 0477219bc30..12ba30a187b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -3384,6 +3384,8 @@ public int getJavaVersion() {
       return 7;
     } else if (versionStr.startsWith("1.8")) {
       return 8;
+    } else if (versionStr.startsWith("17")) {
+      return 17;
     } else { // Some unsupported java version
       return -1;
     }