diff --git a/include/soci/postgresql/soci-postgresql.h b/include/soci/postgresql/soci-postgresql.h
index 16dcc6fb..fed5dcbb 100644
--- a/include/soci/postgresql/soci-postgresql.h
+++ b/include/soci/postgresql/soci-postgresql.h
@@ -25,6 +25,7 @@
 #endif
 
 #include <soci/soci-backend.h>
+#include "soci/connection-parameters.h"
 #include <libpq-fe.h>
 #include <vector>
 
@@ -395,6 +396,7 @@ struct postgresql_session_backend : details::session_backend
     int statementCount_;
     bool single_row_mode_;
     PGconn * conn_;
+    connection_parameters connectionParameters_;
 };
 
 
diff --git a/src/backends/postgresql/error.cpp b/src/backends/postgresql/error.cpp
index 3cc46833..712dbda8 100644
--- a/src/backends/postgresql/error.cpp
+++ b/src/backends/postgresql/error.cpp
@@ -123,8 +123,11 @@ details::postgresql_result::check_for_data(char const* errMsg) const
 
                         if (retry)
                         {
-                            connection_parameters parameters;
-                            parameters.set_connect_string(newTarget);
+                            connection_parameters parameters =
+                                sessionBackend_.connectionParameters_;
+
+                            if (!newTarget.empty())
+                                parameters.set_connect_string(newTarget);
 
                             sessionBackend_.clean_up();
 
diff --git a/src/backends/postgresql/session.cpp b/src/backends/postgresql/session.cpp
index d398d552..34263e52 100644
--- a/src/backends/postgresql/session.cpp
+++ b/src/backends/postgresql/session.cpp
@@ -9,7 +9,6 @@
 #include "soci/soci-platform.h"
 #include "soci/postgresql/soci-postgresql.h"
 #include "soci/session.h"
-#include "soci/connection-parameters.h"
 #include <libpq/libpq-fs.h> // libpq
 #include <cctype>
 #include <cstdio>
@@ -69,6 +68,7 @@ void postgresql_session_backend::connect(
         "Cannot set extra_float_digits parameter");
 
     conn_ = conn;
+    connectionParameters_ = parameters;
 }
 
 postgresql_session_backend::~postgresql_session_backend()