diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php
index a12e6e658b..d99418e497 100644
--- a/phpBB/includes/acp/acp_bbcodes.php
+++ b/phpBB/includes/acp/acp_bbcodes.php
@@ -173,7 +173,7 @@ class acp_bbcodes
 						$bbcode_id = NUM_CORE_BBCODES + 1;
 					}
 
-					if ($bbcode_id > 2039)
+					if ($bbcode_id > 1511)
 					{
 						trigger_error('TOO_MANY_BBCODES');
 					}