diff --git a/src/kits/media/MediaNode.cpp b/src/kits/media/MediaNode.cpp
index bece94a000..c7b5f21f16 100644
--- a/src/kits/media/MediaNode.cpp
+++ b/src/kits/media/MediaNode.cpp
@@ -343,6 +343,13 @@ BMediaNode::WaitForMessage(bigtime_t waitUntil, uint32 flags,
 	char data[B_MEDIA_MESSAGE_SIZE];
 	int32 message;
 	ssize_t size;
+
+	// TODO: Investigate on this issue
+	if (waitUntil < 0) {
+		TRACE("BMediaNode::WaitForMessage: Negative timeout!\n");
+		waitUntil = 0;
+	}
+
 	while (true) {
 		size = read_port_etc(ControlPort(), &message, data,
 			sizeof(data), B_ABSOLUTE_TIMEOUT, waitUntil);