diff --git a/onnxruntime/core/providers/openvino/ov_versions/capability.cc b/onnxruntime/core/providers/openvino/ov_versions/capability.cc
index 4be4bff039df4..593a78491080a 100644
--- a/onnxruntime/core/providers/openvino/ov_versions/capability.cc
+++ b/onnxruntime/core/providers/openvino/ov_versions/capability.cc
@@ -171,16 +171,20 @@ std::vector<std::unique_ptr<ComputeCapability>> GetCapability::Execute() {
     for (auto this_cluster : connected_clusters) {
       bool omit_subgraph = false;
 
-      //auto id = this_cluster.at(0);
       if (this_cluster.size() == 1) {
           //check next cluster
           auto index = this_cluster.at(0);
+          size_t j = cluster_index;
           if (graph_viewer_.GetNode(index)->OpType() == "EPContext") {
               omit_subgraph=false;
-          } else if(cluster_index < total_clusters-1) {
-              bool append_node = AddTrivialClusterToNextClusterIfConnected(graph_viewer_, index, connected_clusters[cluster_index+1]);
+          } else if(j < total_clusters-1) {
+              bool append_node = false;
+              while(j<total_clusters && !append_node) {
+                j=j+1;
+                append_node = AddTrivialClusterToNextClusterIfConnected(graph_viewer_, index, connected_clusters[j]);
+              }
               if(append_node) {
-                connected_clusters[cluster_index+1].emplace_back(index);
+                connected_clusters[j].emplace_back(index);
               }
               omit_subgraph=true;
           }
diff --git a/onnxruntime/test/providers/cpu/controlflow/loop_test.cc b/onnxruntime/test/providers/cpu/controlflow/loop_test.cc
index a92c1ed47f69b..dc50a75873034 100644
--- a/onnxruntime/test/providers/cpu/controlflow/loop_test.cc
+++ b/onnxruntime/test/providers/cpu/controlflow/loop_test.cc
@@ -688,7 +688,7 @@ TEST(Loop, SubgraphTypeOverride) {
   Graph::ResolveOptions options;
   options.override_types = true;
   test.Run(OpTester::ExpectResult::kExpectSuccess, "",
-           {kTensorrtExecutionProvider}, &session_run_options, nullptr,
+           {kTensorrtExecutionProvider, kOpenVINOExecutionProvider}, &session_run_options, nullptr,
            ExecutionMode::ORT_SEQUENTIAL, options);
 }