diff --git a/Libraries/SPTarkov.Server.Core/Helpers/PresetHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/PresetHelper.cs
index fd28fa3d..5391d8f8 100644
--- a/Libraries/SPTarkov.Server.Core/Helpers/PresetHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/PresetHelper.cs
@@ -148,6 +148,11 @@ public class PresetHelper(
             return null;
         }
 
+        if (presetDetails.DefaultId is null)
+        {
+            return null;
+        }
+
         // Use default preset id from above cache to find the weapon/equipment preset
         if (!_defaultWeaponPresets.TryGetValue(presetDetails.DefaultId, out var defaultPreset))
         {
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Presets/PresetCacheDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Presets/PresetCacheDetails.cs
index 13edcedc..4745c1e7 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Presets/PresetCacheDetails.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Presets/PresetCacheDetails.cs
@@ -10,7 +10,7 @@
         }
 
         // Id of the default preset for this tpl
-        public string DefaultId
+        public string? DefaultId
         {
             get;
             set;