diff --git a/workflow/rocoto/gefs_tasks.py b/workflow/rocoto/gefs_tasks.py
index d9ac42ef85..e214bb8c19 100644
--- a/workflow/rocoto/gefs_tasks.py
+++ b/workflow/rocoto/gefs_tasks.py
@@ -585,6 +585,7 @@ def cleanup(self):
                     deps.append(rocoto.add_dependency(dep_dict))
                     dep_dict = {'type': 'metatask', 'name': 'wave_post_bndpnt_bull'}
                     deps.append(rocoto.add_dependency(dep_dict))
+            dependencies = rocoto.create_dependency(dep=deps, dep_condition='and')
 
         resources = self.get_resource('cleanup')
         task_name = 'cleanup'