diff --git a/libraries/cms/helper/contenthistory.php b/libraries/cms/helper/contenthistory.php
index 991aca438ee95..dafe6e1555bb4 100644
--- a/libraries/cms/helper/contenthistory.php
+++ b/libraries/cms/helper/contenthistory.php
@@ -145,7 +145,15 @@ public function store($table)
 		// Load history_limit config from extension.
 		$aliasParts = explode('.', $this->typeAlias);
 
-		if ($maxVersions = JComponentHelper::getParams($aliasParts[0])->get('history_limit', 0))
+		$context = (isset($aliasParts[1])) ? $aliasParts[1] : '';
+
+		$maxVersionsContext = JComponentHelper::getParams($aliasParts[0])->get('history_limit' . '_' . $context, 0);
+
+		if ($maxVersionsContext)
+		{
+			$historyTable->deleteOldVersions($maxVersionsContext);
+		}
+		elseif ($maxVersions = JComponentHelper::getParams($aliasParts[0])->get('history_limit', 0))
 		{
 			$historyTable->deleteOldVersions($maxVersions);
 		}