diff --git a/uppsrc/PostgreSQL/PostgreSQL.cpp b/uppsrc/PostgreSQL/PostgreSQL.cpp
index f0955759f..73d544756 100644
--- a/uppsrc/PostgreSQL/PostgreSQL.cpp
+++ b/uppsrc/PostgreSQL/PostgreSQL.cpp
@@ -513,11 +513,17 @@ bool PostgreSQLConnection::Execute()
 			s = PostgreSQLReadString(s, query);
 		else {
 			if(*s == '?' && !noquestionparams) {
-				if(pi >= param.GetCount()) {
-					session.SetError("Invalid number of parameters", statement);
-					return false;
+				if(s[1] == '?') {
+					query.Cat('?');
+					s++;
+				}
+				else {
+					if(pi >= param.GetCount()) {
+						session.SetError("Invalid number of parameters", statement);
+						return false;
+					}
+					query.Cat(param[pi++]);
 				}
-				query.Cat(param[pi++]);
 			}
 			else
 				query.Cat(*s);