diff --git a/persistence-modules/spring-jpa-2/src/main/java/com/baeldung/multitenant/config/MultitenantConfiguration.java b/persistence-modules/spring-jpa-2/src/main/java/com/baeldung/multitenant/config/MultitenantConfiguration.java
index 64d66f5cc9..cf547066dd 100644
--- a/persistence-modules/spring-jpa-2/src/main/java/com/baeldung/multitenant/config/MultitenantConfiguration.java
+++ b/persistence-modules/spring-jpa-2/src/main/java/com/baeldung/multitenant/config/MultitenantConfiguration.java
@@ -1,5 +1,6 @@
 package com.baeldung.multitenant.config;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.context.annotation.Bean;
@@ -18,6 +19,9 @@ import java.util.Properties;
 @Configuration
 public class MultitenantConfiguration {
 
+    @Value("${defaultTenant}")
+    private String defaultTenant;
+
     @Bean
     @ConfigurationProperties(prefix = "tenants")
     public DataSource dataSource() {
@@ -43,7 +47,7 @@ public class MultitenantConfiguration {
         }
 
         AbstractRoutingDataSource dataSource = new MultitenantDataSource();
-        dataSource.setDefaultTargetDataSource(resolvedDataSources.get("tenant_1"));
+        dataSource.setDefaultTargetDataSource(resolvedDataSources.get(defaultTenant));
         dataSource.setTargetDataSources(resolvedDataSources);
 
         dataSource.afterPropertiesSet();
diff --git a/persistence-modules/spring-jpa-2/src/main/resources/application.properties b/persistence-modules/spring-jpa-2/src/main/resources/application.properties
index 0270c1683e..61fccff032 100644
--- a/persistence-modules/spring-jpa-2/src/main/resources/application.properties
+++ b/persistence-modules/spring-jpa-2/src/main/resources/application.properties
@@ -9,3 +9,7 @@ spring.datasource.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1
 #spring.datasource.username=mysqluser
 #spring.datasource.password=mysqlpass
 #spring.datasource.url=jdbc:mysql://localhost:3306/myDb?createDatabaseIfNotExist=true
+
+# MultiTenantApplication
+defaultTenant=tenant_1
+spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect
\ No newline at end of file