diff --git a/Libraries/Core/Controllers/LocationController.cs b/Libraries/Core/Controllers/LocationController.cs
index 030e6eac..0c2708ec 100644
--- a/Libraries/Core/Controllers/LocationController.cs
+++ b/Libraries/Core/Controllers/LocationController.cs
@@ -59,8 +59,14 @@ public class LocationController(
     /// </summary>
     /// <param name="request"></param>
     /// <returns></returns>
-    public GetAirdropLootResponse GetAirDropLoot(GetAirdropLootRequest request)
+    public GetAirdropLootResponse? GetAirDropLoot(GetAirdropLootRequest? request)
     {
+        if (request is null)
+        {
+            // client sometimes requests this after a raid has ended, just return null
+            return null;
+        }
+        
         if (request.ContainerId is not null)
         {
             return _airdropService.GenerateCustomAirdropLoot(request);