diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/atomic/RedisAtomicInteger.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/atomic/RedisAtomicInteger.java
index e178935b9..bc69f1505 100644
--- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/atomic/RedisAtomicInteger.java
+++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/atomic/RedisAtomicInteger.java
@@ -74,7 +74,7 @@ public class RedisAtomicInteger extends Number implements Serializable, KeyBound
 		this.generalOps = redisTemplate;
 		this.operations = generalOps.opsForValue();
 
-		if (initialValue == null && this.operations.get(redisCounter) == null) {
+		if (initialValue == null || this.operations.get(redisCounter) == null) {
 			set(0);
 		}
 		else {
diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/atomic/RedisAtomicLong.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/atomic/RedisAtomicLong.java
index 6d87a106a..7fc319b57 100644
--- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/atomic/RedisAtomicLong.java
+++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/atomic/RedisAtomicLong.java
@@ -74,7 +74,7 @@ public class RedisAtomicLong extends Number implements Serializable, KeyBound<St
 		this.generalOps = redisTemplate;
 		this.operations = generalOps.opsForValue();
 
-		if (initialValue == null && this.operations.get(redisCounter) == null) {
+		if (initialValue == null || this.operations.get(redisCounter) == null) {
 			set(0);
 		}
 		else {