diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/BatchTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/BatchTests.java
index 255125cad6..e602cba109 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/BatchTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/BatchTests.java
@@ -35,7 +35,9 @@
  */
 package org.jooq.test._.testcases;
 
+import static java.util.Arrays.asList;
 import static junit.framework.Assert.assertEquals;
+import static org.jooq.tools.reflect.Reflect.on;
 
 import java.sql.Connection;
 import java.sql.Date;
@@ -43,12 +45,14 @@ import java.util.Arrays;
 
 import org.jooq.Batch;
 import org.jooq.ExecuteContext;
+import org.jooq.Field;
 import org.jooq.Record1;
 import org.jooq.Record2;
 import org.jooq.Record3;
 import org.jooq.Record6;
 import org.jooq.Result;
 import org.jooq.TableRecord;
+import org.jooq.UDTRecord;
 import org.jooq.UpdatableRecord;
 import org.jooq.impl.DefaultConnectionProvider;
 import org.jooq.impl.DefaultExecuteListener;
@@ -198,6 +202,55 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
             .fetchOne(0));
     }
 
+    @SuppressWarnings("unchecked")
+    @Test
+    public void testBatchStoreWithUDTs() throws Exception {
+        if (cUAddressType() == null) {
+            log.info("SKIPPING", "Skipping batch store with UDT tests");
+            return;
+        }
+
+        jOOQAbstractTest.reset = false;
+
+        // [#2139] Check for correct binding of UDT values in batch operations
+        UDTRecord<?> addr1 = cUAddressType().newInstance();
+        UDTRecord<?> addr2 = cUAddressType().newInstance();
+
+        on(addr1).call("setCity", "City X");
+        on(addr2).call("setCity", "City Y");
+
+        A a1 = create().newRecord(TAuthor());
+        A a2 = create().newRecord(TAuthor());
+
+        a1.setValue(TAuthor_ID(), 3);
+        a2.setValue(TAuthor_ID(), 4);
+
+        a1.setValue(TAuthor_LAST_NAME(), "X");
+        a2.setValue(TAuthor_LAST_NAME(), "Y");
+
+        a1.setValue((Field<UDTRecord<?>>) TAuthor_ADDRESS(), addr1);
+        a2.setValue((Field<UDTRecord<?>>) TAuthor_ADDRESS(), addr2);
+
+        Batch batch = create().batchStore(a1, a2);
+        assertEquals(2, batch.size());
+
+        int[] result = batch.execute();
+        assertEquals(2, result.length);
+
+        Result<A> authors = create()
+            .selectFrom(TAuthor())
+            .where(TAuthor_ID().in(3, 4))
+            .orderBy(TAuthor_ID())
+            .fetch();
+
+        assertEquals(2, authors.size());
+        assertEquals(asList(3, 4), authors.getValues(TAuthor_ID()));
+        assertEquals(asList("X", "Y"), authors.getValues(TAuthor_LAST_NAME()));
+        assertEquals(asList(addr1, addr2), authors.getValues(TAuthor_ADDRESS()));
+        assertEquals("City X", on(authors.get(0).getValue(TAuthor_ADDRESS())).call("getCity").get());
+        assertEquals("City Y", on(authors.get(1).getValue(TAuthor_ADDRESS())).call("getCity").get());
+    }
+
     @Test
     public void testBatchDelete() throws Exception {
         jOOQAbstractTest.reset = false;
diff --git a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
index 8d37437486..68834a80c9 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
@@ -1844,6 +1844,11 @@ public abstract class jOOQAbstractTest<
         new BatchTests(this).testBatchStore();
     }
 
+    @Test
+    public void testBatchStoreWithUDTs() throws Exception {
+        new BatchTests(this).testBatchStoreWithUDTs();
+    }
+
     @Test
     public void testBatchDelete() throws Exception {
         new BatchTests(this).testBatchDelete();
diff --git a/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java b/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java
index 42ef798229..a024255a6e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java
@@ -117,12 +117,13 @@ class BatchSingle implements BatchBindStep {
             for (Object[] bindValues : allBindValues) {
                 listener.bindStart(ctx);
 
-                // [#1371] Don't bind variables directly onto statement, bind
-                // them through the Query to preserve type information
+                // [#1371] [#2139] Don't bind variables directly onto statement,
+                // bind them through the collected params list to preserve type
+                // information
                 for (int i = 0; i < params.size(); i++) {
                     params.get(i).setConverted(bindValues[i]);
                 }
-                new DefaultBindContext(create, ctx.statement()).bind(query);
+                new DefaultBindContext(create, ctx.statement()).bind(params);
 
                 listener.bindEnd(ctx);
                 ctx.statement().addBatch();