diff --git a/src/output/MultipleOutputs.cxx b/src/output/MultipleOutputs.cxx
index bd12f2e91..f87baa6bc 100644
--- a/src/output/MultipleOutputs.cxx
+++ b/src/output/MultipleOutputs.cxx
@@ -148,10 +148,7 @@ MultipleOutputs::EnableDisable()
 		ao->EnableDisableAsync();
 	}
 
-	for (auto *ao : outputs) {
-		const std::lock_guard<Mutex> lock(ao->mutex);
-		ao->WaitForCommand();
-	}
+	WaitAll();
 }
 
 void