diff --git a/Emby.Server.Implementations/Library/SearchEngine.cs b/Emby.Server.Implementations/Library/SearchEngine.cs
index 1d9529dff4..94602582b7 100644
--- a/Emby.Server.Implementations/Library/SearchEngine.cs
+++ b/Emby.Server.Implementations/Library/SearchEngine.cs
@@ -47,7 +47,7 @@ namespace Emby.Server.Implementations.Library
 
             if (query.Limit.HasValue)
             {
-                results = results.GetRange(0, query.Limit.Value);
+                results = results.GetRange(0, Math.Min(query.Limit.Value, results.Count));
             }
 
             return new QueryResult<SearchHintInfo>