diff --git a/packages/grpc-js/package.json b/packages/grpc-js/package.json
index 408168e9..09a88b5a 100644
--- a/packages/grpc-js/package.json
+++ b/packages/grpc-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grpc/grpc-js",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "description": "gRPC Library for Node - pure JS implementation",
   "homepage": "https://grpc.io/",
   "repository": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js",
diff --git a/packages/grpc-js/src/load-balancer-pick-first.ts b/packages/grpc-js/src/load-balancer-pick-first.ts
index 884af50b..240f0e9f 100644
--- a/packages/grpc-js/src/load-balancer-pick-first.ts
+++ b/packages/grpc-js/src/load-balancer-pick-first.ts
@@ -184,8 +184,10 @@ export class PickFirstLoadBalancer implements LoadBalancer {
         ) {
           /* If all of the subchannels are IDLE we should go back to a
            * basic IDLE state where there is no subchannel list to avoid
-           * holding unused resources */
-          this.resetSubchannelList();
+           * holding unused resources. We do not reset triedAllSubchannels
+           * because that is a reminder to request reresolution the next time
+           * this LB policy needs to connect. */
+          this.resetSubchannelList(false);
           this.updateState(ConnectivityState.IDLE, new QueuePicker(this));
           return;
         }
@@ -337,7 +339,7 @@ export class PickFirstLoadBalancer implements LoadBalancer {
     this.channelControlHelper.updateState(newState, picker);
   }
 
-  private resetSubchannelList() {
+  private resetSubchannelList(resetTriedAllSubchannels = true) {
     for (const subchannel of this.subchannels) {
       subchannel.removeConnectivityStateListener(this.subchannelStateListener);
       subchannel.unref();
@@ -352,7 +354,9 @@ export class PickFirstLoadBalancer implements LoadBalancer {
       [ConnectivityState.TRANSIENT_FAILURE]: 0,
     };
     this.subchannels = [];
-    this.triedAllSubchannels = false;
+    if (resetTriedAllSubchannels) {
+      this.triedAllSubchannels = false;
+    }
   }
 
   /**
@@ -425,6 +429,12 @@ export class PickFirstLoadBalancer implements LoadBalancer {
   }
 
   exitIdle() {
+    if (
+      this.currentState === ConnectivityState.IDLE ||
+      this.triedAllSubchannels
+    ) {
+      this.channelControlHelper.requestReresolution();
+    }
     for (const subchannel of this.subchannels) {
       subchannel.startConnecting();
     }
@@ -433,12 +443,6 @@ export class PickFirstLoadBalancer implements LoadBalancer {
         this.connectToAddressList();
       }
     }
-    if (
-      this.currentState === ConnectivityState.IDLE ||
-      this.triedAllSubchannels
-    ) {
-      this.channelControlHelper.requestReresolution();
-    }
   }
 
   resetBackoff() {
diff --git a/packages/grpc-js/src/resolving-load-balancer.ts b/packages/grpc-js/src/resolving-load-balancer.ts
index 7b9f92cb..985b6e31 100644
--- a/packages/grpc-js/src/resolving-load-balancer.ts
+++ b/packages/grpc-js/src/resolving-load-balancer.ts
@@ -298,7 +298,6 @@ export class ResolvingLoadBalancer implements LoadBalancer {
   }
 
   exitIdle() {
-    this.childLoadBalancer.exitIdle();
     if (this.currentState === ConnectivityState.IDLE || this.currentState === ConnectivityState.TRANSIENT_FAILURE) {
       if (this.backoffTimeout.isRunning()) {
         this.continueResolving = true;
@@ -306,6 +305,7 @@ export class ResolvingLoadBalancer implements LoadBalancer {
         this.updateResolution();
       }
     }
+    this.childLoadBalancer.exitIdle();
   }
 
   updateAddressList(