From 65075e50a742c04d4544252f55a2f24471e45e31 Mon Sep 17 00:00:00 2001
From: Michael Lumish <mlumish@google.com>
Date: Thu, 12 May 2022 17:34:25 -0700
Subject: [PATCH] Only start the timer if the ADS stream is running

---
 packages/grpc-js-xds/src/xds-stream-state/xds-stream-state.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/grpc-js-xds/src/xds-stream-state/xds-stream-state.ts b/packages/grpc-js-xds/src/xds-stream-state/xds-stream-state.ts
index 2ff5130c..1d96728a 100644
--- a/packages/grpc-js-xds/src/xds-stream-state/xds-stream-state.ts
+++ b/packages/grpc-js-xds/src/xds-stream-state/xds-stream-state.ts
@@ -113,7 +113,9 @@ export abstract class BaseXdsStreamState<ResponseType> implements XdsStreamState
         cachedResponse: null,
         resourceTimer: setTimeout(() => {}, 0)
       };
-      this.startResourceTimer(subscriptionEntry);
+      if (this.isAdsStreamRunning) {
+        this.startResourceTimer(subscriptionEntry);
+      }
       this.subscriptions.set(name, subscriptionEntry);
     }
     subscriptionEntry.watchers.push(watcher);