diff --git a/src/backend/distributed/connection/connection_configuration.c b/src/backend/distributed/connection/connection_configuration.c
index c52254f9c..e07692517 100644
--- a/src/backend/distributed/connection/connection_configuration.c
+++ b/src/backend/distributed/connection/connection_configuration.c
@@ -521,9 +521,23 @@ char *
 GetAuthinfo(char *hostname, int32 port, char *user)
 {
 	char *authinfo = NULL;
-	bool isLoopback = (strncmp(LOCAL_HOST_NAME, hostname, MAX_NODE_LENGTH) == 0 &&
+	bool isLoopback = (strncmp(LocalHostName, hostname, MAX_NODE_LENGTH) == 0 &&
 					   PostPortNumber == port);
 
+	/*
+	 * Citus will not be loaded when we run a global DDL command from a
+	 * Citus non-main database.
+	 */
+	if (!CitusHasBeenLoaded())
+	{
+		/*
+		 * We don't expect non-main databases to connect to a node other than
+		 * the local one.
+		 */
+		Assert(isLoopback);
+		return "";
+	}
+
 	if (IsTransactionState())
 	{
 		int64 nodeId = WILDCARD_NODE_ID;
diff --git a/src/backend/distributed/metadata/metadata_cache.c b/src/backend/distributed/metadata/metadata_cache.c
index 555365e68..402dedb8a 100644
--- a/src/backend/distributed/metadata/metadata_cache.c
+++ b/src/backend/distributed/metadata/metadata_cache.c
@@ -5723,14 +5723,6 @@ GetPoolinfoViaCatalog(int32 nodeId)
 char *
 GetAuthinfoViaCatalog(const char *roleName, int64 nodeId)
 {
-	/*
-	 * Citus will not be loaded when we run a global DDL command from a
-	 * Citus non-main database.
-	 */
-	if (!CitusHasBeenLoaded())
-	{
-		return "";
-	}
 	char *authinfo = "";
 	Datum nodeIdDatumArray[2] = {
 		Int32GetDatum(nodeId),
diff --git a/src/test/regress/expected/other_databases.out b/src/test/regress/expected/other_databases.out
index 9e170861e..15bff66ed 100644
--- a/src/test/regress/expected/other_databases.out
+++ b/src/test/regress/expected/other_databases.out
@@ -71,9 +71,15 @@ SELECT citus_internal.execute_command_on_remote_nodes_as_user($$SELECT 'dangerou
 ERROR:  operation is not allowed
 HINT:  Run the command with a superuser.
 \c other_db1
+SET citus.local_hostname TO '127.0.0.1';
 SET ROLE nonsuperuser;
+-- Make sure that we don't try to access pg_dist_node.
+-- Otherwise, we would get the following error:
+--   ERROR:  cache lookup failed for pg_dist_node, called too early?
 CREATE USER other_db_user9;
 RESET ROLE;
+RESET citus.local_hostname;
+RESET ROLE;
 \c regression
 SELECT usename FROM pg_user WHERE usename LIKE 'other\_db\_user%' ORDER BY 1;
     usename
diff --git a/src/test/regress/sql/other_databases.sql b/src/test/regress/sql/other_databases.sql
index 563793518..8cd54f354 100644
--- a/src/test/regress/sql/other_databases.sql
+++ b/src/test/regress/sql/other_databases.sql
@@ -51,9 +51,16 @@ SET ROLE nonsuperuser;
 SELECT citus_internal.execute_command_on_remote_nodes_as_user($$SELECT 'dangerous query'$$, 'postgres');
 
 \c other_db1
+SET citus.local_hostname TO '127.0.0.1';
 SET ROLE nonsuperuser;
+
+-- Make sure that we don't try to access pg_dist_node.
+-- Otherwise, we would get the following error:
+--   ERROR:  cache lookup failed for pg_dist_node, called too early?
 CREATE USER other_db_user9;
 
+RESET ROLE;
+RESET citus.local_hostname;
 RESET ROLE;
 \c regression
 SELECT usename FROM pg_user WHERE usename LIKE 'other\_db\_user%' ORDER BY 1;