diff --git a/org/postgresql/core/Parser.java b/org/postgresql/core/Parser.java
index 23ab3f7c02..0c1083f357 100644
--- a/org/postgresql/core/Parser.java
+++ b/org/postgresql/core/Parser.java
@@ -83,6 +83,9 @@ public static List<NativeQuery> parseJdbcSql(String query, boolean standardConfo
                 break;
 
             case '?':
+				if (!withParameters)
+					break;
+
                 nativeSql.append(aChars, fragmentStart, i - fragmentStart);
                 if (i + 1 < aChars.length && aChars[i + 1] == '?') /* replace ?? with ? */
                 {