diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java
index e622f76a8a..cb43cbbf9b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java
@@ -222,9 +222,15 @@ public abstract class AbstractRoutine<T> extends AbstractQueryPart implements Ro
     @Override
     public final int execute(Configuration c) {
 
-        // Ensure that all depending Attachables are attached
-        attach(c);
-        return execute();
+        // Ensure that all depending Attachables are attached
+        Configuration previous = configuration();
+        try {
+            attach(c);
+            return execute();
+        }
+        finally {
+            attach(previous);
+        }
     }
 
     @Override