diff --git a/module_build_service/scheduler/producer.py b/module_build_service/scheduler/producer.py
index 3e80db6d..bdf1ae05 100644
--- a/module_build_service/scheduler/producer.py
+++ b/module_build_service/scheduler/producer.py
@@ -402,7 +402,7 @@ def sync_koji_build_tags():
         models.ModuleBuild.state == models.BUILD_STATES["build"]
     ).all()
     for module_build in module_builds:
-        complete_components = module_build.current_batch(koji.BUILD_STATES["COMPLETE"])
+        complete_components = module_build.up_to_current_batch(state=koji.BUILD_STATES["COMPLETE"])
         for c in complete_components:
             # In case the component is tagged in the build tag and
             # also tagged in the final tag (or it is build_time_only