diff --git a/PaperlessMCP/Client/PaperlessClient.cs b/PaperlessMCP/Client/PaperlessClient.cs
index 3c52cbb..1fc1a68 100644
--- a/PaperlessMCP/Client/PaperlessClient.cs
+++ b/PaperlessMCP/Client/PaperlessClient.cs
@@ -27,7 +27,8 @@ public class PaperlessClient
     private static readonly JsonSerializerOptions JsonOptions = new()
     {
         PropertyNameCaseInsensitive = true,
-        PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower
+        PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower,
+        DefaultIgnoreCondition = System.Text.Json.Serialization.JsonIgnoreCondition.WhenWritingNull
     };
 
     public PaperlessClient(HttpClient httpClient, IOptions<PaperlessOptions> options, ILogger<PaperlessClient> logger)
diff --git a/PaperlessMCP/Program.cs b/PaperlessMCP/Program.cs
index 9c818f6..a4cabc2 100644
--- a/PaperlessMCP/Program.cs
+++ b/PaperlessMCP/Program.cs
@@ -38,7 +38,11 @@ else
 
     builder.Services
         .AddMcpServer()
-        .WithHttpTransport()
+        .WithHttpTransport(options =>
+        {
+            // Increase idle timeout to 24 hours to prevent session drops during long operations
+            options.IdleTimeout = TimeSpan.FromHours(24);
+        })
         .WithToolsFromAssembly();
 
     var app = builder.Build();