diff --git a/administrator/components/com_installer/models/languages.php b/administrator/components/com_installer/models/languages.php
index 139fac0e55190..5c742dd97b3e0 100644
--- a/administrator/components/com_installer/models/languages.php
+++ b/administrator/components/com_installer/models/languages.php
@@ -179,8 +179,9 @@ function($a, $b) use ($that)
 
 		// Count the non-paginated list
 		$this->languageCount = count($languages);
+		$limit               = ($this->getState('list.limit') > 0) ? $this->getState('list.limit') : $this->languageCount;
 
-		return array_slice($languages, $this->getStart(), $this->getState('list.limit'));
+		return array_slice($languages, $this->getStart(), $limit);
 	}
 
 	/**