diff --git a/src/kits/app/LinkReceiver.cpp b/src/kits/app/LinkReceiver.cpp
index 1dfab3152c..8dcc325284 100644
--- a/src/kits/app/LinkReceiver.cpp
+++ b/src/kits/app/LinkReceiver.cpp
@@ -104,7 +104,8 @@ LinkReceiver::GetNextMessage(int32 &code, bigtime_t timeout)
 bool
 LinkReceiver::HasMessages() const
 {
-	return port_count(fReceivePort) > 0;
+	return fDataSize - (fRecvStart + fReplySize) > 0
+		|| port_count(fReceivePort) > 0;
 }