diff --git a/hipamd/src/hip_graph.cpp b/hipamd/src/hip_graph.cpp
index 49ea1fbe94..1c8dc895ae 100644
--- a/hipamd/src/hip_graph.cpp
+++ b/hipamd/src/hip_graph.cpp
@@ -1703,7 +1703,8 @@ hipError_t hipGraphExecMemsetNodeSetParams(hipGraphExec_t hGraphExec, hipGraphNo
   if (clonedNode == nullptr) {
     HIP_RETURN(hipErrorInvalidValue);
   }
-  hipError_t status = reinterpret_cast<hip::GraphMemsetNode*>(clonedNode)->SetParams(pNodeParams, true);
+  hipError_t status = reinterpret_cast<hip::GraphMemsetNode*>(clonedNode)
+                 ->SetParams(pNodeParams, true);
   if(status != hipSuccess) {
     HIP_RETURN(status);
   }
@@ -3268,7 +3269,15 @@ hipError_t hipDrvGraphExecMemsetNodeSetParams(hipGraphExec_t hGraphExec, hipGrap
   if (clonedNode == nullptr) {
     HIP_RETURN(hipErrorInvalidValue);
   }
-  HIP_RETURN(reinterpret_cast<hip::GraphMemsetNode*>(clonedNode)->SetParams(memsetParams, true));
+  hipError_t status = reinterpret_cast<hip::GraphMemsetNode*>(clonedNode)
+                 ->SetParams(memsetParams, true);
+  if(status != hipSuccess) {
+    HIP_RETURN(status);
+  }
+  if (DEBUG_CLR_GRAPH_PACKET_CAPTURE) {
+    status = reinterpret_cast<hip::GraphExec*>(hGraphExec)->UpdateAQLPacket(clonedNode);
+  }
+  HIP_RETURN(status);
 }
 
 hipError_t hipGraphExecGetFlags(hipGraphExec_t graphExec, unsigned long long* flags) {