diff --git a/ckanext/datastore/bin/datastore_setup.py b/ckanext/datastore/bin/datastore_setup.py
index ee29389825a..d27af1cba70 100644
--- a/ckanext/datastore/bin/datastore_setup.py
+++ b/ckanext/datastore/bin/datastore_setup.py
@@ -24,7 +24,7 @@ def _run_cmd(command_line, inputstring=''):
 def _run_sql(sql, as_sql_user, pgport, database='postgres'):
     logging.debug("Executing: \n#####\n", sql, "\n####\nOn database:", database)
     _run_cmd("sudo -u '{username}' psql -p {pgport} --dbname='{database}' --no-password --set ON_ERROR_STOP=1".format(
-        pgport=pgport,
+        pgport=pgport or '5432',
         username=as_sql_user,
         database=database
     ), inputstring=sql)
diff --git a/ckanext/datastore/commands.py b/ckanext/datastore/commands.py
index 37866cb7ed5..c1171058628 100644
--- a/ckanext/datastore/commands.py
+++ b/ckanext/datastore/commands.py
@@ -59,6 +59,7 @@ def command(self):
         if cmd == 'set-permissions':
             setup.set_permissions(
                 pguser=self.args[1],
+                pgport=self.db_ckan_url_parts['db_port'],
                 ckandb=self.db_ckan_url_parts['db_name'],
                 datastoredb=self.db_write_url_parts['db_name'],
                 ckanuser=self.db_ckan_url_parts['db_user'],