diff --git a/api/src/Etemplate/Widget/Taglist.php b/api/src/Etemplate/Widget/Taglist.php
index 19ae736f56..b89a7ab207 100644
--- a/api/src/Etemplate/Widget/Taglist.php
+++ b/api/src/Etemplate/Widget/Taglist.php
@@ -79,7 +79,7 @@ class Taglist extends Etemplate\Widget
 				$links = Api\Accounts::link_query($query, $options);
 			}
 		}
-		else
+		elseif($query) // Only search if there's a query, avoid searching for all
 		{
 			$links = Api\Link::query($app, $query, $options);
 		}