diff --git a/src/Module/Api/Mastodon/Search.php b/src/Module/Api/Mastodon/Search.php
index 9d75758462..bad84b2b93 100644
--- a/src/Module/Api/Mastodon/Search.php
+++ b/src/Module/Api/Mastodon/Search.php
@@ -65,12 +65,16 @@ class Search extends BaseApi
 		// Attempt WebFinger lookup. Defaults to false.
 		$resolve = $request['resolve'];
 		// Maximum number of results to load, per type. Defaults to 20. Max 40.
-		$limit = $request['limit'];
+		$limit = max($request['limit'], 40);
 		// Offset in search results. Used for pagination. Defaults to 0.
 		$offset = $request['offset'];
 		// Only who the user is following. Defaults to false.
 		$following = $request['following'];
 
+		if (empty($q)) {
+			DI::mstdnError()->UnprocessableEntity();
+		}
+
 		$result = ['accounts' => [], 'statuses' => [], 'hashtags' => []];
 
 		if (empty($type) || ($type == 'accounts')) {