diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
index 7e7ebbfe89..4d516b32ac 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
@@ -188,8 +188,7 @@ public class FlywayAutoConfiguration {
 
 		private void applyConnectionDetails(FlywayConnectionDetails connectionDetails, DataSourceBuilder<?> builder) {
 			builder.username(connectionDetails.getUsername());
-			String password = connectionDetails.getPassword();
-			builder.password((password != null) ? password : "");
+			builder.password(connectionDetails.getPassword());
 			String driverClassName = connectionDetails.getDriverClassName();
 			if (StringUtils.hasText(driverClassName)) {
 				builder.driverClassName(driverClassName);
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
index dc78d6c9ef..c349882c5c 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
@@ -215,7 +215,7 @@ class FlywayAutoConfigurationTests {
 				DataSource dataSource = context.getBean(Flyway.class).getConfiguration().getDataSource();
 				assertThat(dataSource).isNotNull();
 				assertThat(dataSource).hasFieldOrPropertyWithValue("username", null);
-				assertThat(dataSource).hasFieldOrPropertyWithValue("password", "");
+				assertThat(dataSource).hasFieldOrPropertyWithValue("password", null);
 			});
 	}