diff --git a/projects/clr/hipamd/src/functional_grid_launch.inl b/projects/clr/hipamd/src/functional_grid_launch.inl
index 336bb5d121..6283d1aaba 100644
--- a/projects/clr/hipamd/src/functional_grid_launch.inl
+++ b/projects/clr/hipamd/src/functional_grid_launch.inl
@@ -123,21 +123,17 @@ namespace hip_impl
             };
         }
 
-        for (auto&& agent_kernel : it0->second) {
-            if (agent.handle == agent_kernel.first.handle) {
-                hipModuleLaunchKernel(
-                    agent_kernel.second,
-                    numBlocks.x,
-                    numBlocks.y,
-                    numBlocks.z,
-                    dimBlocks.x,
-                    dimBlocks.y,
-                    dimBlocks.z,
-                    sharedMemBytes,
-                    stream,
-                    nullptr,
-                    kernarg);
-            }
-        }
+        hipModuleLaunchKernel(
+            it1->second,
+            numBlocks.x,
+            numBlocks.y,
+            numBlocks.z,
+            dimBlocks.x,
+            dimBlocks.y,
+            dimBlocks.z,
+            sharedMemBytes,
+            stream,
+            nullptr,
+            kernarg);
     }
 }