diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPlugin.cs b/Flow.Launcher.Core/Plugin/JsonRPCPlugin.cs
index 5e44bef86..58bd40807 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCPlugin.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCPlugin.cs
@@ -254,7 +254,7 @@ namespace Flow.Launcher.Core.Plugin
                 catch (OperationCanceledException)
                 {
                     await buffer.DisposeAsync();
-                    throw;
+                    return Stream.Null;
                 }
 
                 buffer.Seek(0, SeekOrigin.Begin);
@@ -289,11 +289,15 @@ namespace Flow.Launcher.Core.Plugin
 
         public async Task<List<Result>> QueryAsync(Query query, CancellationToken token)
         {
-            var output = await ExecuteQueryAsync(query, token);
             try
             {
+                var output = await ExecuteQueryAsync(query, token);
                 return await DeserializedResultAsync(output);
             }
+            catch (OperationCanceledException)
+            {
+                return null;
+            }
             catch (Exception e)
             {
                 Log.Exception($"|JsonRPCPlugin.Query|Exception when query <{query}>", e);