diff --git a/lib/Db/CacheActorsRequest.php b/lib/Db/CacheActorsRequest.php
index 8ea1438c..cabb1008 100644
--- a/lib/Db/CacheActorsRequest.php
+++ b/lib/Db/CacheActorsRequest.php
@@ -250,6 +250,7 @@ class CacheActorsRequest extends CacheActorsRequestBuilder {
 		$this->searchInAccount($qb, $search);
 		$this->leftJoinCacheDocuments($qb, 'icon_id');
 		$this->leftJoinDetails($qb);
+		$this->limitResults($qb, 25);
 
 		$accounts = [];
 		$cursor = $qb->execute();
diff --git a/lib/Db/CoreRequestBuilder.php b/lib/Db/CoreRequestBuilder.php
index 4909c854..c2c32dda 100644
--- a/lib/Db/CoreRequestBuilder.php
+++ b/lib/Db/CoreRequestBuilder.php
@@ -190,6 +190,16 @@ class CoreRequestBuilder {
 		$this->limitToDBField($qb, 'token', $token);
 	}
 
+	/**
+	 * Limit the results to a given number
+	 *
+	 * @param IQueryBuilder $qb
+	 * @param int $limit
+	 */
+	protected function limitResults(IQueryBuilder $qb, int $limit) {
+		$qb->setMaxResults($limit);
+	}
+
 
 	/**
 	 * Limit the request to the ActorId
diff --git a/lib/Db/HashtagsRequest.php b/lib/Db/HashtagsRequest.php
index 8fc8b6fa..7cf9c167 100644
--- a/lib/Db/HashtagsRequest.php
+++ b/lib/Db/HashtagsRequest.php
@@ -128,6 +128,7 @@ class HashtagsRequest extends HashtagsRequestBuilder {
 	public function searchHashtags(string $hashtag): array {
 		$qb = $this->getHashtagsSelectSql();
 		$this->searchInHashtag($qb, $hashtag);
+		$this->limitResults($qb, 25);
 
 		$hashtags = [];
 		$cursor = $qb->execute();