diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/dml/SQLMergeClause.java b/querydsl-sql/src/main/java/com/querydsl/sql/dml/SQLMergeClause.java
index fe7812392..535b53cce 100644
--- a/querydsl-sql/src/main/java/com/querydsl/sql/dml/SQLMergeClause.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/dml/SQLMergeClause.java
@@ -563,7 +563,7 @@ public class SQLMergeClause extends AbstractSQLClause<SQLMergeClause> implements
 
     @Override
     public boolean isEmpty() {
-        return values.isEmpty();
+        return values.isEmpty() && batches.isEmpty();
     }
 
     @Override
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/MergeBase.java b/querydsl-sql/src/test/java/com/querydsl/sql/MergeBase.java
index 30c7ad855..d2947a728 100644
--- a/querydsl-sql/src/test/java/com/querydsl/sql/MergeBase.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/MergeBase.java
@@ -156,6 +156,7 @@ public class MergeBase extends AbstractBaseTest {
             .set(survey.name, "5")
             .addBatch();
         assertEquals(1, merge.getBatchCount());
+        assertFalse(merge.isEmpty());
 
         merge
             .keys(survey.id)