diff --git a/main/http_server/http_server.c b/main/http_server/http_server.c
index ab711ab08..2a17ed45a 100644
--- a/main/http_server/http_server.c
+++ b/main/http_server/http_server.c
@@ -327,6 +327,44 @@ static esp_err_t PATCH_update_settings(httpd_req_t * req)
     return ESP_OK;
 }
 
+static esp_err_t PATCH_update_raw(httpd_req_t * req)
+{
+    // Set CORS headers
+    if (set_cors_headers(req) != ESP_OK) {
+        httpd_resp_send_500(req);
+        return ESP_FAIL;
+    }
+
+    char * buf = ((rest_server_context_t *) (req->user_ctx))->scratch;
+    if (ESP_OK != recv_http_req(req, buf)) {
+        return ESP_FAIL;
+    }
+
+    cJSON * root = cJSON_Parse(buf);
+    cJSON * item;
+    cJSON_ArrayForEach(item, root) {
+        cJSON * const type_j = cJSON_GetObjectItem(item, "type");
+        if (!type_j) continue;
+        const char * const type = type_j->valuestring;
+        cJSON * const val = cJSON_GetObjectItem(item, "val");
+        if (!val) continue;
+
+        if (!strcmp(type, "str")) {
+            nvs_config_set_string(item->string, val->valuestring);
+        } else if (!strcmp(type, "u16")) {
+            nvs_config_set_u16(item->string, val->valueint);
+        } else if (!strcmp(type, "u64")) {
+            nvs_config_set_u64(item->string, val->valuedouble);
+        } else if (!strcmp(type, "erase")) {
+            nvs_config_erase(item->string);
+        }
+    }
+
+    cJSON_Delete(root);
+    httpd_resp_send_chunk(req, NULL, 0);
+    return ESP_OK;
+}
+
 static esp_err_t POST_restart(httpd_req_t * req)
 {
     ESP_LOGI(TAG, "Restarting System because of API Request");
@@ -734,6 +772,18 @@ esp_err_t start_rest_server(void * pvParameters)
     };
     httpd_register_uri_handler(server, &system_options_uri);
 
+    httpd_uri_t update_system_raw_uri = {
+        .uri = "/api/system/raw", .method = HTTP_PATCH, .handler = PATCH_update_raw, .user_ctx = rest_context};
+    httpd_register_uri_handler(server, &update_system_raw_uri);
+
+    httpd_uri_t system_raw_options_uri = {
+        .uri = "/api/system/raw",
+        .method = HTTP_OPTIONS,
+        .handler = handle_options_request,
+        .user_ctx = NULL,
+    };
+    httpd_register_uri_handler(server, &system_raw_options_uri);
+
     httpd_uri_t update_post_ota_firmware = {
         .uri = "/api/system/OTA", .method = HTTP_POST, .handler = POST_OTA_update, .user_ctx = NULL};
     httpd_register_uri_handler(server, &update_post_ota_firmware);