diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 8e9cc3a950..6a0aedf8c6 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -415,6 +415,10 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage
 	{
 		$upload->set_disallowed_content(explode('|', $config['mime_triggers']));
 	}
+	else if (!$config['check_attachment_content'])
+	{
+		$upload->set_disallowed_content(array());
+	}
 
 	$filedata['post_attach'] = $local || $upload->is_valid($form_name);