diff --git a/ml-algorithms/src/main/java/org/opensearch/ml/engine/encryptor/EncryptorImpl.java b/ml-algorithms/src/main/java/org/opensearch/ml/engine/encryptor/EncryptorImpl.java
index 329459973e..5615236f95 100644
--- a/ml-algorithms/src/main/java/org/opensearch/ml/engine/encryptor/EncryptorImpl.java
+++ b/ml-algorithms/src/main/java/org/opensearch/ml/engine/encryptor/EncryptorImpl.java
@@ -187,7 +187,6 @@ private void handleGetDataObjectResponse(
         AtomicReference<Exception> exceptionRef,
         CountDownLatch latch
     ) {
-        context.restore();
         log.debug("Completed Get MASTER_KEY Request, for tenant id:{}", tenantId);
 
         if (throwable != null) {
@@ -195,6 +194,7 @@ private void handleGetDataObjectResponse(
         } else {
             handleGetDataObjectSuccess(response, tenantId, exceptionRef, latch, context);
         }
+        context.restore();
     }
 
     private void handleGetDataObjectFailure(Throwable throwable, AtomicReference<Exception> exceptionRef, CountDownLatch latch) {
diff --git a/plugin/src/main/java/org/opensearch/ml/action/agents/DeleteAgentTransportAction.java b/plugin/src/main/java/org/opensearch/ml/action/agents/DeleteAgentTransportAction.java
index 8e702d7186..cbe6cd0e48 100644
--- a/plugin/src/main/java/org/opensearch/ml/action/agents/DeleteAgentTransportAction.java
+++ b/plugin/src/main/java/org/opensearch/ml/action/agents/DeleteAgentTransportAction.java
@@ -99,9 +99,9 @@ protected void doExecute(Task task, ActionRequest request, ActionListener<Delete
             sdkClient
                 .getDataObjectAsync(getDataObjectRequest, client.threadPool().executor(GENERAL_THREAD_POOL))
                 .whenComplete((r, throwable) -> {
-                    context.restore();
                     log.debug("Completed Get Agent Request, Agent id:{}", agentId);
                     if (throwable != null) {
+                        context.restore();
                         Exception cause = SdkClientUtils.unwrapAndConvertToException(throwable);
                         if (cause instanceof IndexNotFoundException) {
                             log.info("Failed to get Agent index", cause);
@@ -124,6 +124,7 @@ protected void doExecute(Task task, ActionRequest request, ActionListener<Delete
                                     if (TenantAwareHelper
                                         .validateTenantResource(mlFeatureEnabledSetting, tenantId, mlAgent.getTenantId(), actionListener)) {
                                         if (mlAgent.getIsHidden() && !isSuperAdmin) {
+                                            context.restore();
                                             actionListener
                                                 .onFailure(
                                                     new OpenSearchStatusException(
@@ -144,15 +145,12 @@ protected void doExecute(Task task, ActionRequest request, ActionListener<Delete
                                                             .build(),
                                                         client.threadPool().executor(GENERAL_THREAD_POOL)
                                                     )
-                                                    .whenComplete(
-                                                        (response, delThrowable) -> handleDeleteResponse(
-                                                            response,
-                                                            delThrowable,
-                                                            tenantId,
-                                                            actionListener
-                                                        )
-                                                    );
+                                                    .whenComplete((response, delThrowable) -> {
+                                                        context.restore();
+                                                        handleDeleteResponse(response, delThrowable, tenantId, actionListener);
+                                                    });
                                             } catch (Exception e) {
+                                                context.restore();
                                                 log.error("Failed to delete ML agent: {}", agentId, e);
                                                 actionListener.onFailure(e);
                                             }