diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/lock/DefaultLockRepository.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/lock/DefaultLockRepository.java
index 0b8654b6bf..059bc19ee0 100644
--- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/lock/DefaultLockRepository.java
+++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/lock/DefaultLockRepository.java
@@ -73,17 +73,21 @@ public class DefaultLockRepository implements LockRepository, InitializingBean {
 
 	private String deleteQuery = "DELETE FROM %sLOCK WHERE REGION=? AND LOCK_KEY=? AND CLIENT_ID=?";
 
-	private String deleteExpiredQuery = "DELETE FROM %sLOCK WHERE REGION=? AND LOCK_KEY=? AND CREATED_DATE<?";
+	private String deleteExpiredQuery = "DELETE FROM %sLOCK WHERE REGION=? AND CREATED_DATE<?";
 
 	private String deleteAllQuery = "DELETE FROM %sLOCK WHERE REGION=? AND CLIENT_ID=?";
 
-	private String updateQuery = "UPDATE %sLOCK SET CREATED_DATE=? WHERE REGION=? AND LOCK_KEY=? AND CLIENT_ID=?";
+	private String updateQuery =
+			"UPDATE %sLOCK SET CLIENT_ID=?, CREATED_DATE=? WHERE REGION=? AND LOCK_KEY=? " +
+					"AND (CLIENT_ID=? OR CREATED_DATE<?)";
 
 	private String insertQuery = "INSERT INTO %sLOCK (REGION, LOCK_KEY, CLIENT_ID, CREATED_DATE) VALUES (?, ?, ?, ?)";
 
 	private String countQuery =
 			"SELECT COUNT(REGION) FROM %sLOCK WHERE REGION=? AND LOCK_KEY=? AND CLIENT_ID=? AND CREATED_DATE>=?";
 
+	private String renewQuery = "UPDATE %sLOCK SET CREATED_DATE=? WHERE REGION=? AND LOCK_KEY=? AND CLIENT_ID=?";
+
 	/**
 	 * Constructor that initializes the client id that will be associated for
 	 * all the locks persisted by the store instance to a random {@link UUID}.
@@ -142,6 +146,7 @@ public class DefaultLockRepository implements LockRepository, InitializingBean {
 		this.updateQuery = String.format(this.updateQuery, this.prefix);
 		this.insertQuery = String.format(this.insertQuery, this.prefix);
 		this.countQuery = String.format(this.countQuery, this.prefix);
+		this.renewQuery = String.format(this.renewQuery, this.prefix);
 	}
 
 	@Override
@@ -154,11 +159,11 @@ public class DefaultLockRepository implements LockRepository, InitializingBean {
 		this.template.update(this.deleteQuery, this.region, lock, this.id);
 	}
 
-	@Transactional(isolation = Isolation.SERIALIZABLE, timeout = 1)
+	@Transactional(isolation = Isolation.SERIALIZABLE)
 	@Override
 	public boolean acquire(String lock) {
-		deleteExpired(lock);
-		if (this.template.update(this.updateQuery, new Date(), this.region, lock, this.id) > 0) {
+		if (this.template.update(this.updateQuery, this.id, new Date(), this.region, lock, this.id,
+				new Date(System.currentTimeMillis() - this.ttl)) > 0) {
 			return true;
 		}
 		try {
@@ -171,19 +176,18 @@ public class DefaultLockRepository implements LockRepository, InitializingBean {
 
 	@Override
 	public boolean isAcquired(String lock) {
-		deleteExpired(lock);
 		return this.template.queryForObject(this.countQuery, Integer.class, // NOSONAR query never returns null
 				this.region, lock, this.id, new Date(System.currentTimeMillis() - this.ttl)) == 1;
 	}
 
-	private void deleteExpired(String lock) {
-		this.template.update(this.deleteExpiredQuery, this.region, lock,
-				new Date(System.currentTimeMillis() - this.ttl));
+	@Override
+	public void deleteExpired() {
+		this.template.update(this.deleteExpiredQuery, this.region, new Date(System.currentTimeMillis() - this.ttl));
 	}
 
 	@Override
 	public boolean renew(String lock) {
-		return this.template.update(this.updateQuery, new Date(), this.region, lock, this.id) > 0;
+		return this.template.update(this.renewQuery, new Date(), this.region, lock, this.id) > 0;
 	}
 
 }
diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/lock/LockRepository.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/lock/LockRepository.java
index efe26d09f8..947a4bd698 100644
--- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/lock/LockRepository.java
+++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/lock/LockRepository.java
@@ -34,6 +34,8 @@ public interface LockRepository extends Closeable {
 
 	void delete(String lock);
 
+	void deleteExpired();
+
 	boolean acquire(String lock);
 
 	boolean renew(String lock);
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/lock/JdbcLockRegistryTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/lock/JdbcLockRegistryTests.java
index bb40297b79..6d4526db24 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/lock/JdbcLockRegistryTests.java
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/lock/JdbcLockRegistryTests.java
@@ -36,10 +36,13 @@ import org.springframework.integration.test.util.TestUtils;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
+import javax.sql.DataSource;
+
 /**
  * @author Dave Syer
  * @author Artem Bilan
  * @author Stefan Vassilev
+ * @author Alexandre Strubel
  *
  * @since 4.3
  */
@@ -55,6 +58,9 @@ public class JdbcLockRegistryTests {
 	@Autowired
 	private LockRepository client;
 
+	@Autowired
+	private DataSource dataSource;
+
 	@BeforeEach
 	public void clear() {
 		this.registry.expireUnusedOlderThan(0);
@@ -127,6 +133,26 @@ public class JdbcLockRegistryTests {
 		}
 	}
 
+	@Test
+	public void testReentrantLockAfterExpiration() throws Exception {
+		DefaultLockRepository client = new DefaultLockRepository(dataSource);
+		client.setTimeToLive(1);
+		client.afterPropertiesSet();
+		JdbcLockRegistry registry = new JdbcLockRegistry(client);
+		Lock lock1 = registry.obtain("foo");
+		assertThat(lock1.tryLock()).isTrue();
+		Thread.sleep(100);
+		try {
+			Lock lock2 = registry.obtain("foo");
+			assertThat(lock2).isSameAs(lock1);
+			assertThat(lock2.tryLock()).isTrue();
+			lock2.unlock();
+		}
+		finally {
+			lock1.unlock();
+		}
+	}
+
 	@Test
 	public void testTwoLocks() throws Exception {
 		for (int i = 0; i < 10; i++) {