diff --git a/java-spiffe-core/src/main/java/io/spiffe/workloadapi/DefaultWorkloadApiClient.java b/java-spiffe-core/src/main/java/io/spiffe/workloadapi/DefaultWorkloadApiClient.java
index 5375417..de00c8e 100644
--- a/java-spiffe-core/src/main/java/io/spiffe/workloadapi/DefaultWorkloadApiClient.java
+++ b/java-spiffe-core/src/main/java/io/spiffe/workloadapi/DefaultWorkloadApiClient.java
@@ -334,12 +334,13 @@ public final class DefaultWorkloadApiClient implements WorkloadApiClient {
                 for (val context : cancellableContexts) {
                     context.close();
                 }
-                retryExecutor.shutdown();
-                executorService.shutdown();
 
                 if (managedChannel != null) {
                     managedChannel.close();
                 }
+
+                retryExecutor.shutdown();
+                executorService.shutdown();
                 closed = true;
             }
         }
diff --git a/java-spiffe-core/src/main/java/io/spiffe/workloadapi/StreamObservers.java b/java-spiffe-core/src/main/java/io/spiffe/workloadapi/StreamObservers.java
index 6fd6b9f..270b5d9 100644
--- a/java-spiffe-core/src/main/java/io/spiffe/workloadapi/StreamObservers.java
+++ b/java-spiffe-core/src/main/java/io/spiffe/workloadapi/StreamObservers.java
@@ -45,7 +45,9 @@ final class StreamObservers {
 
             @Override
             public void onError(final Throwable t) {
-                log.log(Level.SEVERE, "X.509 context observer error", t);
+                if (Status.fromThrowable(t).getCode() != Status.Code.CANCELLED) {
+                    log.log(Level.SEVERE, "X.509 context observer error", t);
+                }
                 handleWatchX509ContextError(t);
             }
 
@@ -59,7 +61,7 @@ final class StreamObservers {
 
             private void handleX509ContextRetry(Throwable t) {
                 if (retryHandler.shouldRetry()) {
-                    log.log(Level.INFO, "Retrying connecting to Workload API to register X.509 context watcher");
+                    log.log(Level.FINE, "Retrying connecting to Workload API to register X.509 context watcher");
                     retryHandler.scheduleRetry(() ->
                             cancellableContext.run(
                                     () -> workloadApiAsyncStub.fetchX509SVID(newX509SvidRequest(),
@@ -97,7 +99,9 @@ final class StreamObservers {
 
             @Override
             public void onError(final Throwable t) {
-                log.log(Level.SEVERE, "X.509 bundles observer error", t);
+                if (Status.fromThrowable(t).getCode() != Status.Code.CANCELLED) {
+                    log.log(Level.SEVERE, "X.509 bundles observer error", t);
+                }
                 handleWatchX509BundlesError(t);
             }
 
@@ -111,7 +115,7 @@ final class StreamObservers {
 
             private void handleX509BundlesRetry(Throwable t) {
                 if (retryHandler.shouldRetry()) {
-                    log.log(Level.INFO, "Retrying connecting to Workload API to register X.509 bundles watcher");
+                    log.log(Level.FINE, "Retrying connecting to Workload API to register X.509 bundles watcher");
                     retryHandler.scheduleRetry(() ->
                             cancellableContext.run(
                                     () -> workloadApiAsyncStub.fetchX509Bundles(newX509BundlesRequest(),
@@ -149,7 +153,9 @@ final class StreamObservers {
 
             @Override
             public void onError(final Throwable t) {
-                log.log(Level.SEVERE, "JWT observer error", t);
+                if (Status.fromThrowable(t).getCode() != Status.Code.CANCELLED) {
+                    log.log(Level.SEVERE, "JWT observer error", t);
+                }
                 handleWatchJwtBundleError(t);
             }
 
@@ -163,7 +169,7 @@ final class StreamObservers {
 
             private void handleJwtBundleRetry(Throwable t) {
                 if (retryHandler.shouldRetry()) {
-                    log.log(Level.INFO, "Retrying connecting to Workload API to register JWT Bundles watcher");
+                    log.log(Level.FINE, "Retrying connecting to Workload API to register JWT Bundles watcher");
                     retryHandler.scheduleRetry(() ->
                             cancellableContext.run(() -> workloadApiAsyncStub.fetchJWTBundles(newJwtBundlesRequest(),
                                     this)));
diff --git a/java-spiffe-core/src/main/java/io/spiffe/workloadapi/retry/RetryHandler.java b/java-spiffe-core/src/main/java/io/spiffe/workloadapi/retry/RetryHandler.java
index 1ec4f3f..29e3dff 100644
--- a/java-spiffe-core/src/main/java/io/spiffe/workloadapi/retry/RetryHandler.java
+++ b/java-spiffe-core/src/main/java/io/spiffe/workloadapi/retry/RetryHandler.java
@@ -28,6 +28,10 @@ public class RetryHandler {
      * @param runnable the task to be scheduled for execution
      */
     public void scheduleRetry(final Runnable runnable) {
+        if (executor.isShutdown()) {
+            return;
+        }
+
         if (exponentialBackoffPolicy.reachedMaxRetries(retryCount)) {
             return;
         }
diff --git a/java-spiffe-core/src/test/java/io/spiffe/workloadapi/retry/RetryHandlerTest.java b/java-spiffe-core/src/test/java/io/spiffe/workloadapi/retry/RetryHandlerTest.java
index c366288..8d7a300 100644
--- a/java-spiffe-core/src/test/java/io/spiffe/workloadapi/retry/RetryHandlerTest.java
+++ b/java-spiffe-core/src/test/java/io/spiffe/workloadapi/retry/RetryHandlerTest.java
@@ -11,8 +11,7 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.*;
 
 class RetryHandlerTest {
 
@@ -78,7 +77,8 @@ class RetryHandlerTest {
 
         // fourth retry exceeds max retries
         retryHandler.scheduleRetry(runnable);
-        verifyNoInteractions(scheduledExecutorService);
+        verify(scheduledExecutorService).isShutdown();
+        verifyNoMoreInteractions(scheduledExecutorService);
     }
 
     @Test