diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/DmlStatementFactory.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/DmlStatementFactory.java
index 9bca46bab1..38933c6edb 100644
--- a/symmetric-db/src/main/java/org/jumpmind/db/platform/DmlStatementFactory.java
+++ b/symmetric-db/src/main/java/org/jumpmind/db/platform/DmlStatementFactory.java
@@ -68,7 +68,8 @@ public static DmlStatement createDmlStatement(String databaseName, DmlType dmlTy
             return new OracleDmlStatement(dmlType, catalogName, schemaName, tableName, keys,
                     columns, nullKeyValues, ddlBuilder.getDatabaseInfo(),
                     ddlBuilder.isDelimitedIdentifierModeOn(), textColumnExpression);
-        } else if (DatabaseNamesConstants.POSTGRESQL.equals(databaseName)) {
+        } else if (DatabaseNamesConstants.POSTGRESQL.equals(databaseName) || (DatabaseNamesConstants.POSTGRESQL95.equals(databaseName) &&
+                System.getProperty("postgres.use.on.conflict", "").equalsIgnoreCase("false"))) {
             return new PostgreSqlDmlStatement(dmlType, catalogName, schemaName, tableName, keys,
                     columns, nullKeyValues, ddlBuilder.getDatabaseInfo(),
                     ddlBuilder.isDelimitedIdentifierModeOn(), textColumnExpression);