diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/SearchService.java b/libresonic-main/src/main/java/org/libresonic/player/service/SearchService.java
index 821c7209..004a16c0 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/SearchService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/SearchService.java
@@ -159,6 +159,8 @@ public class SearchService {
         int count = criteria.getCount();
         result.setOffset(offset);
 
+        if (count <= 0) return result;
+
         IndexReader reader = null;
         try {
             reader = createIndexReader(indexType);