diff --git a/changelog.rst b/changelog.rst
index d249aaa0..ed69bcb9 100644
--- a/changelog.rst
+++ b/changelog.rst
@@ -10,6 +10,7 @@ Bug fixes:
 * Load keyring only when keyring is enabled in the config file (#1041). (Thanks: `Zhaolong Zhu`_)
 * No longer depend on sqlparse as being less than 0.3.0 with the release of sqlparse 0.3.0. (Thanks: `VVelox`_)
 * Fix the broken support for pgservice . (Thanks: `Xavier Francisco`_)
+* Connecting using socket is broken in current master. (#1053). (Thanks: `Irina Truong`_)
 
 Internal:
 ---------
diff --git a/pgcli/pgexecute.py b/pgcli/pgexecute.py
index 93c8de42..fd2c18cc 100644
--- a/pgcli/pgexecute.py
+++ b/pgcli/pgexecute.py
@@ -265,11 +265,11 @@ class PGExecute(object):
         # TODO: use actual connection info from psycopg2.extensions.Connection.info as psycopg>2.8 is available and required dependency  # noqa
         dsn_parameters = conn.get_dsn_parameters()
 
-        self.dbname = dsn_parameters['dbname']
-        self.user = dsn_parameters['user']
+        self.dbname = dsn_parameters.get('dbname')
+        self.user = dsn_parameters.get('user')
         self.password = password
-        self.host = dsn_parameters['host']
-        self.port = dsn_parameters['port']
+        self.host = dsn_parameters.get('host')
+        self.port = dsn_parameters.get('port')
         self.extra_args = kwargs
 
         if not self.host: