diff --git a/redis.go b/redis.go
index 4d683f75..04940915 100644
--- a/redis.go
+++ b/redis.go
@@ -288,11 +288,9 @@ func (c *baseClient) withConn(
 		return err
 	}
 
-	defer func() {
-		c.releaseConn(ctx, cn, err)
-	}()
-
-	return fn(ctx, cn)
+	err = fn(ctx, cn)
+	c.releaseConn(ctx, cn, err)
+	return err
 }
 
 func (c *baseClient) dial(ctx context.Context, network, addr string) (net.Conn, error) {