diff --git a/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/data/nosql.adoc b/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/data/nosql.adoc
index 6551711d9ed5..f5c48ce143bd 100644
--- a/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/data/nosql.adoc
+++ b/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/data/nosql.adoc
@@ -76,7 +76,7 @@ TIP: You can also register an arbitrary number of beans that implement javadoc:o
 javadoc:io.lettuce.core.resource.ClientResources[] can also be customized using javadoc:org.springframework.boot.data.redis.autoconfigure.ClientResourcesBuilderCustomizer[].
 If you use Jedis, javadoc:org.springframework.boot.data.redis.autoconfigure.JedisClientConfigurationBuilderCustomizer[] is also available.
 
-Alternatively, you can register a bean of type javadoc:org.springframework.data.redis.connection.RedisStandaloneConfiguration[], javadoc:org.springframework.data.redis.connection.RedisSentinelConfiguration[], javadoc:org.springframework.data.redis.connection.RedisClusterConfiguration[], or javadoc:org.springframework.data.redis.connection.RedisStaticMasterReplicaConfiguration[]] to take full control over the configuration.
+Alternatively, you can register a bean of type javadoc:org.springframework.data.redis.connection.RedisStandaloneConfiguration[], javadoc:org.springframework.data.redis.connection.RedisSentinelConfiguration[], javadoc:org.springframework.data.redis.connection.RedisClusterConfiguration[], or javadoc:org.springframework.data.redis.connection.RedisStaticMasterReplicaConfiguration[] to take full control over the configuration.
 
 NOTE: master/replica is not supported by Jedis.
 
diff --git a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisConnectionConfiguration.java b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisConnectionConfiguration.java
index 3f475f502bff..1ee59085bfd0 100644
--- a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisConnectionConfiguration.java
+++ b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisConnectionConfiguration.java
@@ -154,6 +154,7 @@ protected final RedisStandaloneConfiguration getStandaloneConfig() {
 		}
 		if (this.connectionDetails.getMasterReplica() != null) {
 			List<Node> nodes = this.connectionDetails.getMasterReplica().getNodes();
+			Assert.state(!nodes.isEmpty(), "At least one node is required for master-replica configuration");
 			RedisStaticMasterReplicaConfiguration config = new RedisStaticMasterReplicaConfiguration(
 					nodes.get(0).host(), nodes.get(0).port());
 			nodes.stream().skip(1).forEach((node) -> config.addNode(node.host(), node.port()));