diff --git a/ml-algorithms/src/main/java/org/opensearch/ml/engine/algorithms/agent/MLChatAgentRunner.java b/ml-algorithms/src/main/java/org/opensearch/ml/engine/algorithms/agent/MLChatAgentRunner.java
index 38be5cf5f0..b9a4228361 100644
--- a/ml-algorithms/src/main/java/org/opensearch/ml/engine/algorithms/agent/MLChatAgentRunner.java
+++ b/ml-algorithms/src/main/java/org/opensearch/ml/engine/algorithms/agent/MLChatAgentRunner.java
@@ -502,7 +502,12 @@ private void runReAct(
                             );
                             toolParams.put(TENANT_ID_FIELD, tenantId);
                             lastToolParams.clear();
-                            lastToolParams.putAll(toolParams);
+                            toolParams.forEach((key, value) -> {
+                                // For the case like tenant id is null
+                                if (key != null && value != null) {
+                                    lastToolParams.put(key, value);
+                                }
+                            });
                             runTool(
                                 tools,
                                 toolSpecMap,