diff --git a/src/core/libraries/np/np_web_api2/np_web_api2_context.cpp b/src/core/libraries/np/np_web_api2/np_web_api2_context.cpp
index 8e6b37b2a..c2c753714 100644
--- a/src/core/libraries/np/np_web_api2/np_web_api2_context.cpp
+++ b/src/core/libraries/np/np_web_api2/np_web_api2_context.cpp
@@ -165,9 +165,6 @@ bool IsInternalHeader(const char* header_name) {
 }
 
 s32 Request::AddHttpRequestHeader(const char* field_name, const char* field_value) {
-    std::string name{field_name};
-    std::string value{field_value};
-
     if (!this->parent_ctx->IsInternal() && IsInternalHeader(field_name)) {
         LOG_WARNING(Lib_NpWebApi2, "This is not an internal context, skipping field name {}",
                     field_name);
@@ -175,19 +172,7 @@ s32 Request::AddHttpRequestHeader(const char* field_name, const char* field_valu
     }
 
     this->Lock();
-    HttpRequestHeader* new_header = new HttpRequestHeader(nullptr, nullptr, name, value);
-    if (!this->http_headers) {
-        // Creates a new blank head node
-        this->http_headers = new HttpRequestHeader(nullptr, nullptr, "", "");
-        this->http_headers->prev = this->http_headers;
-        this->http_headers->next = this->http_headers;
-    }
-
-    new_header->prev = this->http_headers->prev;
-    new_header->next = this->http_headers;
-    this->http_headers->prev->next = new_header;
-    this->http_headers->prev = new_header;
-    http_header_count++;
+    this->http_headers.emplace_back(new HttpRequestHeader(field_name, field_value));
     this->Unlock();
     return ORBIS_OK;
 }
diff --git a/src/core/libraries/np/np_web_api2/np_web_api2_context.h b/src/core/libraries/np/np_web_api2/np_web_api2_context.h
index ec38d67ac..09ee2f282 100644
--- a/src/core/libraries/np/np_web_api2/np_web_api2_context.h
+++ b/src/core/libraries/np/np_web_api2/np_web_api2_context.h
@@ -6,6 +6,7 @@
 #include "core/libraries/system/userservice.h"
 
 #include <atomic>
+#include <deque>
 #include <map>
 #include <mutex>
 #include <string>
@@ -208,12 +209,10 @@ private:
     bool sent{};
 
     struct HttpRequestHeader {
-        HttpRequestHeader* prev;
-        HttpRequestHeader* next;
         std::string field_name;
         std::string field_value;
-    }* http_headers{};
-    s32 http_header_count{};
+    };
+    std::deque<HttpRequestHeader*> http_headers{};
 };
 
 }; // namespace Libraries::Np::NpWebApi2
\ No newline at end of file