diff --git a/src/output/Thread.cxx b/src/output/Thread.cxx
index 6fdd91ab6..88e164846 100644
--- a/src/output/Thread.cxx
+++ b/src/output/Thread.cxx
@@ -74,13 +74,7 @@ AudioOutputControl::InternalOpen2(const AudioFormat in_audio_format)
 		try {
 			output->ConfigureConvertFilter();
 		} catch (...) {
-			open = false;
-
-			{
-				const ScopeUnlock unlock(mutex);
-				output->CloseOutput(false);
-			}
-
+			InternalCloseOutput(false);
 			throw;
 		}
 	}