diff --git a/daemon/extension/QueueScript.cpp b/daemon/extension/QueueScript.cpp
index 09f63d3d..a5066836 100644
--- a/daemon/extension/QueueScript.cpp
+++ b/daemon/extension/QueueScript.cpp
@@ -213,7 +213,18 @@ void QueueScriptController::AddMessage(Message::EKind kind, const char* text)
 	}
 	else
 	{
-		ScriptController::AddMessage(kind, text);
+		DownloadQueue* downloadQueue = DownloadQueue::Lock();
+		NzbInfo* nzbInfo = downloadQueue->GetQueue()->Find(m_id);
+		if (nzbInfo)
+		{
+			nzbInfo->AddMessage(kind, text);
+		}
+		DownloadQueue::Unlock();
+
+		if (!nzbInfo)
+		{
+			ScriptController::AddMessage(kind, text);
+		}
 	}
 }