diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index 928ac084d0..ea9f1ce2a4 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -694,15 +694,14 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 	 * @var bool	bbcode_status	BBCode status
 	 * @var bool	smilies_status	Smilies status
 	 * @var bool	img_status		Image BBCode status
-	 * @var bool	flash_status	Flash BBCode status
 	 * @var bool	url_status		URL BBCode status
 	 * @since 3.3.3-RC1
+	 * @changed 4.0.0-a1 Removed flash_status
 	 */
 	$vars = [
 		'bbcode_status',
 		'smilies_status',
 		'img_status',
-		'flash_status',
 		'url_status',
 	];
 	extract($phpbb_dispatcher->trigger_event('core.ucp_pm_compose_modify_bbcode_status', compact($vars)));
diff --git a/phpBB/posting.php b/phpBB/posting.php
index e65012b343..aff9933f45 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -737,16 +737,15 @@ $quote_status	= true;
  * @var bool	smilies_status	Smilies status
  * @var bool	img_status		Image BBCode status
  * @var bool	url_status		URL BBCode status
- * @var bool	flash_status	Flash BBCode status
  * @var bool	quote_status	Quote BBCode status
  * @since 3.3.3-RC1
+ * @changed 4.0.0-a1 Removed flash_status
  */
 $vars = [
 	'bbcode_status',
 	'smilies_status',
 	'img_status',
 	'url_status',
-	'flash_status',
 	'quote_status',
 ];
 extract($phpbb_dispatcher->trigger_event('core.posting_modify_bbcode_status', compact($vars)));