diff --git a/phpBB/phpbb/storage/controller/attachment.php b/phpBB/phpbb/storage/controller/attachment.php
index 5322255f0a..0105451f0c 100644
--- a/phpBB/phpbb/storage/controller/attachment.php
+++ b/phpBB/phpbb/storage/controller/attachment.php
@@ -156,11 +156,6 @@ class attachment extends controller
 			$display_cat = ATTACHMENT_CATEGORY_NONE;
 		}
 
-		if ($display_cat == ATTACHMENT_CATEGORY_FLASH && !$this->user->optionget('viewflash'))
-		{
-			$display_cat = ATTACHMENT_CATEGORY_NONE;
-		}
-
 		if ($thumbnail)
 		{
 			$attachment['physical_filename'] = 'thumb_' . $attachment['physical_filename'];