diff --git a/src/EntityManager.php b/src/EntityManager.php
index f7d47d7b12e..da09ed1b77a 100644
--- a/src/EntityManager.php
+++ b/src/EntityManager.php
@@ -32,7 +32,6 @@
 use Doctrine\Persistence\Mapping\MappingException;
 use Doctrine\Persistence\ObjectRepository;
 use InvalidArgumentException;
-use Throwable;
 
 use function array_keys;
 use function class_exists;
@@ -246,18 +245,22 @@ public function transactional($func)
 
         $this->conn->beginTransaction();
 
+        $successful = false;
+
         try {
             $return = $func($this);
 
             $this->flush();
             $this->conn->commit();
 
-            return $return ?: true;
-        } catch (Throwable $e) {
-            $this->close();
-            $this->conn->rollBack();
+            $successful = true;
 
-            throw $e;
+            return $return ?: true;
+        } finally {
+            if (! $successful) {
+                $this->close();
+                $this->conn->rollBack();
+            }
         }
     }
 
@@ -268,18 +271,22 @@ public function wrapInTransaction(callable $func)
     {
         $this->conn->beginTransaction();
 
+        $successful = false;
+
         try {
             $return = $func($this);
 
             $this->flush();
             $this->conn->commit();
 
-            return $return;
-        } catch (Throwable $e) {
-            $this->close();
-            $this->conn->rollBack();
+            $successful = true;
 
-            throw $e;
+            return $return;
+        } finally {
+            if (! $successful) {
+                $this->close();
+                $this->conn->rollBack();
+            }
         }
     }
 
diff --git a/src/UnitOfWork.php b/src/UnitOfWork.php
index 39ba6b68b7f..97d80862e39 100644
--- a/src/UnitOfWork.php
+++ b/src/UnitOfWork.php
@@ -49,7 +49,6 @@
 use Exception;
 use InvalidArgumentException;
 use RuntimeException;
-use Throwable;
 use UnexpectedValueException;
 
 use function array_chunk;
@@ -427,6 +426,8 @@ public function commit($entity = null)
         $conn = $this->em->getConnection();
         $conn->beginTransaction();
 
+        $successful = false;
+
         try {
             // Collection deletions (deletions of complete collections)
             foreach ($this->collectionDeletions as $collectionToDelete) {
@@ -478,16 +479,18 @@ public function commit($entity = null)
 
                 throw new OptimisticLockException('Commit failed', $object);
             }
-        } catch (Throwable $e) {
-            $this->em->close();
 
-            if ($conn->isTransactionActive()) {
-                $conn->rollBack();
-            }
+            $successful = true;
+        } finally {
+            if (! $successful) {
+                $this->em->close();
 
-            $this->afterTransactionRolledBack();
+                if ($conn->isTransactionActive()) {
+                    $conn->rollBack();
+                }
 
-            throw $e;
+                $this->afterTransactionRolledBack();
+            }
         }
 
         $this->afterTransactionComplete();