diff --git a/src/output/Thread.cxx b/src/output/Thread.cxx
index 3605fc1fd..523a4af5c 100644
--- a/src/output/Thread.cxx
+++ b/src/output/Thread.cxx
@@ -52,8 +52,6 @@ AudioOutputControl::InternalOpen2(const AudioFormat in_audio_format)
 {
 	assert(in_audio_format.IsValid());
 
-	output->OpenSoftwareMixer();
-
 	const auto cf = in_audio_format.WithMask(output->config_audio_format);
 
 	if (open && cf != output->filter_audio_format)
@@ -64,13 +62,9 @@ AudioOutputControl::InternalOpen2(const AudioFormat in_audio_format)
 	output->filter_audio_format = cf;
 
 	if (!open) {
-		try {
+		{
 			const ScopeUnlock unlock(mutex);
 			output->OpenOutputAndConvert(output->filter_audio_format);
-		} catch (...) {
-			const ScopeUnlock unlock(mutex);
-			output->CloseSoftwareMixer();
-			throw;
 		}
 
 		open = true;
@@ -86,13 +80,18 @@ AudioOutputControl::InternalOpen2(const AudioFormat in_audio_format)
 
 			{
 				const ScopeUnlock unlock(mutex);
-				output->Close(false);
+				output->CloseOutput(false);
 			}
 
 			std::throw_with_nested(FormatRuntimeError("Failed to convert for \"%s\" [%s]",
 								  GetName(), output->plugin.name));
 		}
 	}
+
+	{
+		const ScopeUnlock unlock(mutex);
+		output->OpenSoftwareMixer();
+	}
 }
 
 inline bool