diff --git a/src/kits/media/MediaEventLooper.cpp b/src/kits/media/MediaEventLooper.cpp
index e1e4abad45..762a665bd8 100644
--- a/src/kits/media/MediaEventLooper.cpp
+++ b/src/kits/media/MediaEventLooper.cpp
@@ -438,7 +438,6 @@ BMediaEventLooper::Quit()
 		return;
 	
 	SetRunState(B_QUITTING);
-	write_port(ControlPort(), 0, NULL, 0); // null message to unblock the read (see BMediaNode::WaitForMessage)
 	close_port(ControlPort());
 	if (fControlThread != -1) {
 		status_t err;
diff --git a/src/kits/media/MediaNode.cpp b/src/kits/media/MediaNode.cpp
index ad7435792f..2e9b019a6b 100644
--- a/src/kits/media/MediaNode.cpp
+++ b/src/kits/media/MediaNode.cpp
@@ -362,8 +362,6 @@ BMediaNode::WaitForMessage(bigtime_t waitUntil,
 		if (size != B_TIMED_OUT)
 			ERROR("BMediaNode::WaitForMessage: read_port_etc error 0x%08lx\n",size);
 		return size;	// return the error code
-	} else if (size == 0 && message == 0) {
-		return B_OK;	// a null message was received (to unblock the read)
 	}
 
 	PRINT(7, "BMediaNode::WaitForMessage %#lx, node %ld, this %p\n", message, fNodeID, this);