diff --git a/src/servers/media_addon/SystemTimeSource.cpp b/src/servers/media_addon/SystemTimeSource.cpp
index 2d7cc282ac..bac891a54f 100644
--- a/src/servers/media_addon/SystemTimeSource.cpp
+++ b/src/servers/media_addon/SystemTimeSource.cpp
@@ -84,6 +84,6 @@ SystemTimeSource::ControlThread()
 	status_t err;
 	do {
 		err = WaitForMessage(B_INFINITE_TIMEOUT);
-	} while (err != B_BAD_PORT_ID);
+	} while (err == B_OK || err == B_ERROR);
 	TRACE("SystemTimeSource::ControlThread() exit\n");
 }