diff --git a/redisson/src/main/java/org/redisson/RedissonLock.java b/redisson/src/main/java/org/redisson/RedissonLock.java
index 62049e585..bf647a6ff 100644
--- a/redisson/src/main/java/org/redisson/RedissonLock.java
+++ b/redisson/src/main/java/org/redisson/RedissonLock.java
@@ -159,7 +159,9 @@ public class RedissonLock extends RedissonBaseLock {
 
             // lock acquired
             if (ttlRemaining) {
-                internalLockLeaseTime = -1 == leaseTime ? internalLockLeaseTime : unit.toMillis(leaseTime);
+                if (-1 != leaseTime) {
+                    internalLockLeaseTime = unit.toMillis(leaseTime);
+                }
                 scheduleExpirationRenewal(threadId);
             }
         });
@@ -181,7 +183,9 @@ public class RedissonLock extends RedissonBaseLock {
 
             // lock acquired
             if (ttlRemaining == null) {
-                internalLockLeaseTime = -1 == leaseTime ? internalLockLeaseTime : unit.toMillis(leaseTime);
+                if (-1 != leaseTime) {
+                    internalLockLeaseTime = unit.toMillis(leaseTime);
+                }
                 scheduleExpirationRenewal(threadId);
             }
         });