diff --git a/tensorflow/compiler/xla/service/conditional_code_motion.cc b/tensorflow/compiler/xla/service/conditional_code_motion.cc
index eab50ea81f7..d30186e0d89 100644
--- a/tensorflow/compiler/xla/service/conditional_code_motion.cc
+++ b/tensorflow/compiler/xla/service/conditional_code_motion.cc
@@ -975,8 +975,8 @@ class GroupConnectedBoundaries {
             if (pos != new_boundaries_.end()) {
               new_boundaries_.erase(pos);
             }
+            return true;
           }
-          return true;
         } else {
           VLOG(2) << "Skip incompatible multi-dependent boundary: "
                   << next_boundary.ToString() << ":" << next_boundary_count