diff --git a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
index ee522647cb36..835fc4be87dd 100644
--- a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
+++ b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
@@ -955,6 +955,14 @@ protected boolean shouldClose(PooledConnection con, int action) {
         if (con.isDiscarded()) {
             return true;
         }
+        try {
+            if (con.isClosed()) {
+                return true;
+            }
+        } catch (SQLException e) {
+            log.warn("Unable to check if connection is closed", e);
+            return true;
+        }
         if (isClosed()) {
             return true;
         }
diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestValidation.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestValidation.java
index 6cace17452fc..28e3c08cb8f8 100644
--- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestValidation.java
+++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestValidation.java
@@ -28,6 +28,7 @@
 
 import javax.sql.PooledConnection;
 
+import org.apache.tomcat.jdbc.pool.ConnectionPool;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -141,6 +142,27 @@ public void testOnConnectValidationWithValidationSQLDoesNotOccurWhenDisabled() t
         Assert.assertFalse("No transaction must be running after connection is obtained", getMock(cxn).isRunningTransaction());
     }
 
+    @Test
+    public void returnClosedConnection() throws SQLException {
+        ConnectionPool pool = datasource.createPool();
+        pool.resetStats();
+        Assert.assertFalse(datasource.getPoolProperties().isTestOnBorrow());
+        Assert.assertFalse(datasource.getPoolProperties().isTestOnReturn());
+        Assert.assertFalse(datasource.getPoolProperties().isTestWhileIdle());
+        try (Connection connection = datasource.getConnection()) {
+            Assert.assertEquals("size", 1, pool.getSize());
+            Connection realConnection = ((PooledConnection) connection).getConnection();
+            Assert.assertNotSame(connection, realConnection);
+            realConnection.close();
+            Assert.assertTrue(realConnection.isClosed());
+            Assert.assertFalse(connection.isClosed());
+        }
+        Assert.assertEquals("borrowed", 1, pool.getBorrowedCount());
+        Assert.assertEquals("returned", 1, pool.getReturnedCount());
+        Assert.assertEquals("released", 1, pool.getReleasedCount());
+        Assert.assertEquals("size", 0, pool.getSize());
+    }
+
     @Test
     public void testOnConnectValidationSuccessWithValidationQueryAndAutoCommitEnabled() throws SQLException {
         checkOnConnectValidationWithOutcome(ValidationOutcome.SUCCESS, WITHVALIDATIONQUERY, WITHAUTOCOMMIT);
@@ -644,4 +666,4 @@ public boolean execute(String sql) throws SQLException {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Connection.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Connection.java
index 55ca60acff0e..afa577052bf8 100644
--- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Connection.java
+++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Connection.java
@@ -38,6 +38,7 @@
 
 public class Connection implements java.sql.Connection {
     Properties info;
+    private boolean closed = false;
 
     public Connection(Properties info) {
         this.info = info;
@@ -57,6 +58,7 @@ public void clearWarnings() throws SQLException {
 
     @Override
     public void close() throws SQLException {
+        closed = true;
         Driver.disconnectCount.incrementAndGet();
     }
 
@@ -156,7 +158,7 @@ public SQLWarning getWarnings() throws SQLException {
 
     @Override
     public boolean isClosed() throws SQLException {
-        return false;
+        return closed;
     }
 
     @Override