diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index 8c5df53122..e3922d6216 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -327,6 +327,10 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 				$user_context = $_SESSION['domain_name'];
 			}
 		}
+	//Prevent users from bypassing extension limit by using range
+	if ($total_extensions + $range > $_SESSION['limit']['extensions']['numeric']){
+		$range = $_SESSION['limit']['extensions']['numeric'] - $total_extensions;
+	}
 
 	//add or update the database
 	if ($_POST["persistformvar"] != "true") {
@@ -1832,4 +1836,4 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>