diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 9e8a8f08..4942d258 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -103,21 +103,27 @@ async fn send_request(
         .expect("Failed to build client");
 
     let mut headers = HeaderMap::new();
-    headers.insert(USER_AGENT, HeaderValue::from_static("reqwest"));
-    headers.insert("x-foo-bar", HeaderValue::from_static("hi mom"));
-    headers.insert(
-        HeaderName::from_static("x-api-key"),
-        HeaderValue::from_str(models::generate_id("x").as_str()).expect("Failed to create header"),
-    );
+    headers.insert(USER_AGENT, HeaderValue::from_static("yaak"));
 
     for h in req.headers.0 {
-        if h.name.is_empty() {
+        if h.name.is_empty() && h.value.is_empty() {
             continue;
         }
-        headers.insert(
-            HeaderName::from_bytes(h.name.as_bytes()).expect("Failed to create header name"),
-            HeaderValue::from_str(h.value.as_str()).expect("Failed to create header value"),
-        );
+        let header_name = match HeaderName::from_bytes(h.name.as_bytes()) {
+            Ok(n) => n,
+            Err(e) => {
+                eprintln!("Failed to create header name: {}", e);
+                continue;
+            }
+        };
+        let header_value = match HeaderValue::from_str(h.value.as_str()) {
+            Ok(n) => n,
+            Err(e) => {
+                eprintln!("Failed to create header value: {}", e);
+                continue;
+            }
+        };
+        headers.insert(header_name, header_value);
     }
 
     let m =
diff --git a/src-web/components/HeaderEditor.tsx b/src-web/components/HeaderEditor.tsx
index 29000ad6..98b4081e 100644
--- a/src-web/components/HeaderEditor.tsx
+++ b/src-web/components/HeaderEditor.tsx
@@ -13,6 +13,11 @@ type PairWithId = { header: Partial<HttpHeader>; id: string };
 
 export function HeaderEditor({ request }: Props) {
   const updateRequest = useRequestUpdate(request);
+  const saveHeaders = (pairs: PairWithId[]) => {
+    const headers = pairs.map((p) => ({ name: '', value: '', ...p.header }));
+    updateRequest.mutate({ headers });
+  };
+
   const newPair = () => {
     return { header: { name: '', value: '' }, id: Math.random().toString() };
   };
@@ -21,17 +26,22 @@ export function HeaderEditor({ request }: Props) {
     request.headers.map((h) => ({ header: h, id: Math.random().toString() })),
   );
 
-  const handleChangeHeader = (pair: PairWithId) => {
-    setPairs((pairs) => {
-      const newPairs = pairs.map((p) =>
-        pair.id !== p.id ? p : { id: p.id, header: { ...p.header, ...pair.header } },
-      );
-      const headers = newPairs.map((p) => ({ name: '', value: '', ...p.header }));
-      updateRequest.mutate({ headers });
+  const setPairsAndSave = (fn: (pairs: PairWithId[]) => PairWithId[]) => {
+    setPairs((oldPairs) => {
+      const newPairs = fn(oldPairs);
+      saveHeaders(newPairs);
       return newPairs;
     });
   };
 
+  const handleChangeHeader = (pair: PairWithId) => {
+    setPairsAndSave((pairs) =>
+      pairs.map((p) =>
+        pair.id !== p.id ? p : { id: p.id, header: { ...p.header, ...pair.header } },
+      ),
+    );
+  };
+
   useEffect(() => {
     const lastPair = pairs[pairs.length - 1];
     if (lastPair === undefined) {
@@ -40,12 +50,12 @@ export function HeaderEditor({ request }: Props) {
     }
 
     if (lastPair.header.name !== '' || lastPair.header.value !== '') {
-      setPairs((pairs) => [...pairs, newPair()]);
+      setPairsAndSave((pairs) => [...pairs, newPair()]);
     }
   }, [pairs]);
 
   const handleDelete = (pair: PairWithId) => {
-    setPairs((headers) => headers.filter((p) => p.id !== pair.id));
+    setPairsAndSave((oldPairs) => oldPairs.filter((p) => p.id !== pair.id));
   };
 
   return (