diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_internal_util_StaticProperty.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_internal_util_StaticProperty.java
index 16747c29576d..dd4e44d27cea 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_internal_util_StaticProperty.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_internal_util_StaticProperty.java
@@ -136,8 +136,7 @@ final class Target_jdk_internal_util_StaticProperty {
 
     @Substitute
     private static String javaHome() {
-        /* Native images do not have a Java home directory. */
-        return null;
+        return SystemPropertiesSupport.singleton().savedProperties.get("java.home");
     }
 
     @Substitute