diff --git a/hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/internal/StandardDialectResolver.java b/hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/internal/StandardDialectResolver.java
index 34d8b4ba88..d0a3de71e7 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/internal/StandardDialectResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/internal/StandardDialectResolver.java
@@ -169,8 +169,10 @@ public class StandardDialectResolver extends AbstractDialectResolver {
 
 		if ( "Oracle".equals( databaseName ) ) {
 			switch ( databaseMajorVersion ) {
+				case 12:
+					// fall through
 				case 11:
-					return new Oracle10gDialect();
+					// fall through
 				case 10:
 					return new Oracle10gDialect();
 				case 9:
@@ -178,8 +180,9 @@ public class StandardDialectResolver extends AbstractDialectResolver {
 				case 8:
 					return new Oracle8iDialect();
 				default:
-                    LOG.unknownOracleVersion(databaseMajorVersion);
+					LOG.unknownOracleVersion( databaseMajorVersion );
 			}
+			return new Oracle8iDialect();
 		}
 
 		if ( databaseName.startsWith( "Firebird" ) ) {