diff --git a/pgjdbc/src/main/java/org/postgresql/Driver.java b/pgjdbc/src/main/java/org/postgresql/Driver.java
index 0d7d3f70fa981c4a8fae1847169cc2a99cb3007c..e5c4cf32e2b563a13c470a5170ad779c3da70b40 100755
--- a/pgjdbc/src/main/java/org/postgresql/Driver.java
+++ b/pgjdbc/src/main/java/org/postgresql/Driver.java
@@ -566,7 +566,6 @@ public class Driver implements java.sql.Driver {
             return new ReadWriteSplittingPgConnection(hostSpecs(props), props, user(props), database(props), url);
         }
         PgConnection pgConnection = new PgConnection(hostSpecs(props), user(props), database(props), props, url);
-        pgConnection.setProps(props);
         GlobalConnectionTracker.possessConnectionReference(pgConnection.getQueryExecutor(), props);
         LoadBalanceHeartBeating.setConnection(pgConnection, props);
         return pgConnection;
diff --git a/pgjdbc/src/main/java/org/postgresql/jdbc/PgConnection.java b/pgjdbc/src/main/java/org/postgresql/jdbc/PgConnection.java
index 7c770163c33fa387cbd682d65cc23baeb8639cd4..7ba028481ae3605f3cf69c2c3f961766ef399b35 100644
--- a/pgjdbc/src/main/java/org/postgresql/jdbc/PgConnection.java
+++ b/pgjdbc/src/main/java/org/postgresql/jdbc/PgConnection.java
@@ -278,6 +278,7 @@ public class PgConnection implements BaseConnection {
     }
 
     this.creatingURL = url;
+    setProps(info);
 
     bitToString = PGProperty.BIT_TO_STRING.getBoolean(info);
     setDefaultFetchSize(PGProperty.DEFAULT_ROW_FETCH_SIZE.getInt(info));