diff --git a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/DB2SQLDialect.java b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/DB2SQLDialect.java
index a04dc67132938acba31ae0d896887fbd8c1f9092..1a0680ccca16f79720ce546dd1a8525e47c82ddf 100644
--- a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/DB2SQLDialect.java
+++ b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/DB2SQLDialect.java
@@ -152,7 +152,7 @@ public class DB2SQLDialect extends JDBCSQLDialect implements TPRuleProvider {
 
     @Override
     public String getScriptDelimiterRedefiner() {
-    	return "DELIMITER";
+    	return "--#SET TERMINATOR";
     }
 
     @Override
diff --git a/plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/parser/SQLRuleManager.java b/plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/parser/SQLRuleManager.java
index b548b65382abde99505c502ebf8e92b6c2bc124e..4596b181cbd30431200674cb02ccb308e17123fe 100644
--- a/plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/parser/SQLRuleManager.java
+++ b/plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/parser/SQLRuleManager.java
@@ -206,7 +206,7 @@ public class SQLRuleManager {
             if (!CommonUtils.isEmpty(delimRedefine)) {
                 final SQLSetDelimiterToken setDelimiterToken = new SQLSetDelimiterToken();
 
-                rules.add(new SQLDelimiterSetRule(delimRedefine, setDelimiterToken, delimRule));
+                rules.add(0, new SQLDelimiterSetRule(delimRedefine, setDelimiterToken, delimRule));
             }
         }