diff --git a/hibernate-core/src/main/java/org/hibernate/Version.java b/hibernate-core/src/main/java/org/hibernate/Version.java
index 2917063ba029..81c8633525e4 100644
--- a/hibernate-core/src/main/java/org/hibernate/Version.java
+++ b/hibernate-core/src/main/java/org/hibernate/Version.java
@@ -8,6 +8,7 @@
 import org.hibernate.internal.build.AllowSysOut;
 
 import java.lang.invoke.MethodHandles;
+import java.lang.module.ModuleDescriptor;
 
 import static org.jboss.logging.Logger.getMessageLogger;
 
@@ -21,8 +22,8 @@ public final class Version {
 	private static final String VERSION = initVersion();
 
 	private static String initVersion() {
-		final String version = Version.class.getPackage().getImplementationVersion();
-		return version != null ? version : "[WORKING]";
+		ModuleDescriptor moduleDescriptor = Version.class.getModule().getDescriptor() ;
+		return moduleDescriptor != null ? (moduleDescriptor.version().isPresent() ? moduleDescriptor.version().toString() : "[WORKING]") : "[WORKING]";
 	}
 
 	private Version() {