diff --git a/phpBB/phpbb/textformatter/s9e/factory.php b/phpBB/phpbb/textformatter/s9e/factory.php
index 7719ce5afa..81afeafd56 100644
--- a/phpBB/phpbb/textformatter/s9e/factory.php
+++ b/phpBB/phpbb/textformatter/s9e/factory.php
@@ -273,6 +273,11 @@ class factory implements \phpbb\textformatter\cache_interface
 		{
 			$configurator->BBCodes->addCustom($bbcode['usage'], $bbcode['template']);
 		}
+		if (isset($configurator->tags['QUOTE']))
+		{
+			// Remove the nesting limit and let other services remove quotes at parsing time
+			$configurator->tags['QUOTE']->nestingLimit = PHP_INT_MAX;
+		}
 
 		// Modify the template to disable images/flash depending on user's settings
 		foreach (array('FLASH', 'IMG') as $name)