diff --git a/devices/AtModem/Http/Http/WebHeaderCollection.cs b/devices/AtModem/Http/Http/WebHeaderCollection.cs
index f3523fbd7e..a685633fcc 100644
--- a/devices/AtModem/Http/Http/WebHeaderCollection.cs
+++ b/devices/AtModem/Http/Http/WebHeaderCollection.cs
@@ -427,7 +427,16 @@ public void Add(string header)
             }
 
             string name = header.Substring(0, colpos);
-            string value = header.Substring(colpos + 1);
+            // Fix: Check bounds before Substring to prevent ArgumentOutOfRangeException
+            string value;
+            if (colpos + 1 >= header.Length)
+            {
+                value = string.Empty;
+            }
+            else
+            {
+                value = header.Substring(colpos + 1);
+            }
 
             name = CheckBadChars(name, false);
             ThrowOnRestrictedHeader(name);