diff --git a/src/backend/distributed/metadata/metadata_cache.c b/src/backend/distributed/metadata/metadata_cache.c
index 3bf525dd8a6..4f1b942a085 100644
--- a/src/backend/distributed/metadata/metadata_cache.c
+++ b/src/backend/distributed/metadata/metadata_cache.c
@@ -4545,16 +4545,6 @@ GetLocalNodeId(void)
 }
 
 
-/*
- * CachedLocalNodeIdIsValid return true if the cached local node id is valid.
- */
-bool
-CachedLocalNodeIdIsValid(void)
-{
-	return LocalNodeId != -1;
-}
-
-
 /*
  * RegisterLocalGroupIdCacheCallbacks registers the callbacks required to
  * maintain LocalGroupId at a consistent value. It's separate from
diff --git a/src/backend/distributed/shared_library_init.c b/src/backend/distributed/shared_library_init.c
index 28a2da7b517..bd65fa60c01 100644
--- a/src/backend/distributed/shared_library_init.c
+++ b/src/backend/distributed/shared_library_init.c
@@ -2899,13 +2899,6 @@ ApplicationNameAssignHook(const char *newval, void *extra)
 	 * So we set the FinishedStartupCitusBackend flag in StartupCitusBackend to
 	 * indicate when this responsibility handoff has happened.
 	 *
-	 * On the other hand, even if now it's this hook's responsibility to update
-	 * the global pid, we cannot do so if the cached local node id is invalidated
-	 * and we're not allowed to access the catalog tables. Within a transaction
-	 * block, we can access the catalog tables. For this reason, in addition to
-	 * checking FinishedStartupCitusBackend, we also require either being in a
-	 * transaction block or the cached local node id to be valid.
-	 *
 	 * Another solution to the catalog table acccess problem would be to update
 	 * global pid lazily, like we do for HideShards. But that's not possible
 	 * for the global pid, since it is stored in shared memory instead of in a
@@ -2914,8 +2907,7 @@ ApplicationNameAssignHook(const char *newval, void *extra)
 	 * as reasonably possible, which is also why we extract global pids in the
 	 * AuthHook already (extracting doesn't require catalog access).
 	 */
-	if (FinishedStartupCitusBackend &&
-		(IsTransactionState() || CachedLocalNodeIdIsValid()))
+	if (FinishedStartupCitusBackend)
 	{
 		AssignGlobalPID(newval);
 	}
diff --git a/src/include/distributed/metadata_cache.h b/src/include/distributed/metadata_cache.h
index d4779a98aa6..f1120497b72 100644
--- a/src/include/distributed/metadata_cache.h
+++ b/src/include/distributed/metadata_cache.h
@@ -181,7 +181,6 @@ extern CitusTableCacheEntry * LookupCitusTableCacheEntry(Oid relationId);
 extern DistObjectCacheEntry * LookupDistObjectCacheEntry(Oid classid, Oid objid, int32
 														 objsubid);
 extern int32 GetLocalGroupId(void);
-extern bool CachedLocalNodeIdIsValid(void);
 extern int32 GetLocalNodeId(void);
 extern void CitusTableCacheFlushInvalidatedEntries(void);
 extern Oid LookupShardRelationFromCatalog(int64 shardId, bool missing_ok);