diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index 282708f846..c4d6c26152 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -327,8 +327,10 @@ else if ($download_id)
 else
 {
 	// sizeof($attachments) >= 1
-
-	phpbb_download_handle_passworded_forum($db, $auth, $attachment['topic_id']);
+	if (!$attachment['in_message'])
+	{
+		phpbb_download_handle_passworded_forum($db, $auth, $attachment['topic_id']);
+	}
 
 	if (!class_exists('compress'))
 	{