diff --git a/components/com_apps/models/category.php b/components/com_apps/models/category.php
index f4685780d1..9cf7f5e4dc 100644
--- a/components/com_apps/models/category.php
+++ b/components/com_apps/models/category.php
@@ -135,18 +135,15 @@ public function getExtensions(): array
 			$joomlaRelease = $this->getState('filter.release');
 
 			// Check for each major version branch, default to 3.x as the oldest version supported by the client is Joomla 3.2
-
 			if (version_compare($joomlaRelease, '6.0', '>='))
 			{
 				$url->setVar('filter[versions]', '60');
 			}
-
-			if (version_compare($joomlaRelease, '5.0', '>='))
+			elseif (version_compare($joomlaRelease, '5.0', '>='))
 			{
 				$url->setVar('filter[versions]', '50');
 			}
-
-			if (version_compare($joomlaRelease, '4.0', '>='))
+			elseif (version_compare($joomlaRelease, '4.0', '>='))
 			{
 				$url->setVar('filter[versions]', '40');
 			}
diff --git a/components/com_apps/models/dashboard.php b/components/com_apps/models/dashboard.php
index 3697ece8c7..4a4e69a55a 100644
--- a/components/com_apps/models/dashboard.php
+++ b/components/com_apps/models/dashboard.php
@@ -106,18 +106,15 @@ public function getExtensions(): array
 			$joomlaRelease = $this->getState('filter.release');
 
 			// Check for each major version branch, default to 3.x as the oldest version supported by the client is Joomla 3.2
-
 			if (version_compare($joomlaRelease, '6.0', '>='))
 			{
 				$url->setVar('filter[versions]', '60');
 			}
-
-			if (version_compare($joomlaRelease, '5.0', '>='))
+			elseif (version_compare($joomlaRelease, '5.0', '>='))
 			{
 				$url->setVar('filter[versions]', '50');
 			}
-			
-			if (version_compare($joomlaRelease, '4.0', '>='))
+			elseif (version_compare($joomlaRelease, '4.0', '>='))
 			{
 				$url->setVar('filter[versions]', '40');
 			}