1 files changed, 6 insertions, 1 deletions
diff --git a/app/src/main/java/app/fedilab/android/viewmodel/mastodon/SearchVM.java b/app/src/main/java/app/fedilab/android/viewmodel/mastodon/SearchVM.java
index e52c973b2..5e259a500 100644
--- a/app/src/main/java/app/fedilab/android/viewmodel/mastodon/SearchVM.java
+++ b/app/src/main/java/app/fedilab/android/viewmodel/mastodon/SearchVM.java
@@ -99,10 +99,15 @@ public class SearchVM extends AndroidViewModel {
         MastodonSearchService mastodonSearchService = init(instance);
         resultsMutableLiveData = new MutableLiveData<>();
         new Thread(() -> {
+            int finalLimit = 40;
+            if (limit != null && limit < 40) {
+                finalLimit = limit;
+            }
             Call<Results> resultsCall = mastodonSearchService.search(
                     token, q, account_id, type, exclude_unreviewed,
-                    resolve, following, offset, max_id, min_id, limit);
+                    resolve, following, offset, max_id, min_id, finalLimit);
             Results results = null;
+
             if (resultsCall != null) {
                 try {
                     Response<Results> resultsResponse = resultsCall.execute();