diff --git a/src/output/plugins/WasapiOutputPlugin.cxx b/src/output/plugins/WasapiOutputPlugin.cxx
index 99f7dacf4..84d23dd12 100644
--- a/src/output/plugins/WasapiOutputPlugin.cxx
+++ b/src/output/plugins/WasapiOutputPlugin.cxx
@@ -155,7 +155,7 @@ public:
 	void Finish() noexcept { return SetStatus(Status::FINISH); }
 	void Play() noexcept { return SetStatus(Status::PLAY); }
 	void Pause() noexcept { return SetStatus(Status::PAUSE); }
-	void WaitDataPoped() noexcept { data_poped.Wait(INFINITE); }
+	void WaitDataPoped() noexcept { data_poped.Wait(); }
 	void CheckException() {
 		if (error.occur.load()) {
 			auto err = std::exchange(error.ptr, nullptr);
@@ -269,7 +269,7 @@ void WasapiOutputThread::Work() noexcept {
 	COM com{true};
 	while (true) {
 		try {
-			event.Wait(INFINITE);
+			event.Wait();
 
 			Status current_state = status.load();
 			if (current_state == Status::FINISH) {
@@ -322,7 +322,7 @@ void WasapiOutputThread::Work() noexcept {
 		} catch (...) {
 			error.ptr = std::current_exception();
 			error.occur.store(true);
-			error.thrown.Wait(INFINITE);
+			error.thrown.Wait();
 		}
 	}
 }
diff --git a/src/win32/WinEvent.hxx b/src/win32/WinEvent.hxx
index d298daec9..7b3305c37 100644
--- a/src/win32/WinEvent.hxx
+++ b/src/win32/WinEvent.hxx
@@ -40,7 +40,7 @@ public:
 
 	HANDLE handle() noexcept { return event; }
 
-	DWORD Wait(DWORD milliseconds) noexcept {
+	DWORD Wait(DWORD milliseconds=INFINITE) noexcept {
 		return WaitForSingleObject(event, milliseconds);
 	}