diff --git a/spring-kafka/src/main/java/org/springframework/kafka/core/DefaultKafkaConsumerFactory.java b/spring-kafka/src/main/java/org/springframework/kafka/core/DefaultKafkaConsumerFactory.java
index fd6e873a..4df23bd0 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/core/DefaultKafkaConsumerFactory.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/core/DefaultKafkaConsumerFactory.java
@@ -98,7 +98,9 @@ public class DefaultKafkaConsumerFactory<K, V> implements ConsumerFactory<K, V>
 	}
 
 	protected KafkaConsumer<K, V> createKafkaConsumer(String groupId, String clientIdSuffix) {
-		if (groupId == null && (!this.configs.containsKey(ConsumerConfig.CLIENT_ID_CONFIG) || clientIdSuffix == null)) {
+		boolean shouldModifyClientId = this.configs.containsKey(ConsumerConfig.CLIENT_ID_CONFIG)
+				&& clientIdSuffix != null;
+		if (groupId == null && !shouldModifyClientId) {
 			return createKafkaConsumer();
 		}
 		else {
@@ -106,7 +108,7 @@ public class DefaultKafkaConsumerFactory<K, V> implements ConsumerFactory<K, V>
 			if (groupId != null) {
 				modifiedConfigs.put(ConsumerConfig.GROUP_ID_CONFIG, groupId);
 			}
-			if (clientIdSuffix != null) {
+			if (shouldModifyClientId) {
 				modifiedConfigs.put(ConsumerConfig.CLIENT_ID_CONFIG,
 					modifiedConfigs.get(ConsumerConfig.CLIENT_ID_CONFIG) + clientIdSuffix);
 			}