diff --git a/ext/tag_list/main.php b/ext/tag_list/main.php
index 5d6cf017..d62ef519 100644
--- a/ext/tag_list/main.php
+++ b/ext/tag_list/main.php
@@ -265,9 +265,8 @@ class TagList implements Extension {
 			WHERE tags.id = image_tags.tag_id
 			AND image_tags.image_id = :image_id
 			ORDER BY calc_count DESC
-			LIMIT :tag_list_length
 		";
-		$args = array("image_id"=>$image->id, "tag_list_length"=>$config->get_int('tag_list_length'));
+		$args = array("image_id"=>$image->id);
 
 		$tags = $database->get_all($query, $args);
 		if(count($tags) > 0) {