diff --git a/xls/scheduling/BUILD b/xls/scheduling/BUILD
index 96d6a576bb..3ed729d8c5 100644
--- a/xls/scheduling/BUILD
+++ b/xls/scheduling/BUILD
@@ -692,6 +692,7 @@ cc_library(
     deps = [
         ":pipeline_schedule",
         ":run_pipeline_schedule",
+        ":schedule_graph",
         ":scheduling_options",
         ":scheduling_pass",
         "//xls/common/status:ret_check",
diff --git a/xls/scheduling/pipeline_scheduling_pass.cc b/xls/scheduling/pipeline_scheduling_pass.cc
index d1211885cd..245cabb6cc 100644
--- a/xls/scheduling/pipeline_scheduling_pass.cc
+++ b/xls/scheduling/pipeline_scheduling_pass.cc
@@ -32,6 +32,7 @@
 #include "xls/passes/pass_base.h"
 #include "xls/scheduling/pipeline_schedule.h"
 #include "xls/scheduling/run_pipeline_schedule.h"
+#include "xls/scheduling/schedule_graph.h"
 #include "xls/scheduling/scheduling_options.h"
 #include "xls/scheduling/scheduling_pass.h"
 
@@ -61,7 +62,7 @@ absl::Status AddCycleConstraints(const PipelineSchedule& schedule,
           }
         }
       }
-      if (!already_constrained) {
+      if (!already_constrained && !IsUntimed(node)) {
         scheduling_options.add_constraint(NodeInCycleConstraint(node, c));
       }
     }