diff --git a/src/browser/tests/element/attributes.html b/src/browser/tests/element/attributes.html
index a493242e..9b8c29d3 100644
--- a/src/browser/tests/element/attributes.html
+++ b/src/browser/tests/element/attributes.html
@@ -248,7 +248,7 @@
 }
 </script>
 
-<div id=legacy></a>
+<a id=legacy></a>
 <script id=legacy>
   {
     let a = document.getElementById('legacy').attributes;
@@ -266,3 +266,19 @@
     testing.expectEqual('abc123', a[0].value);
   }
 </script>
+
+<div id="nsa"></div>
+<script id=non-string-attr>
+  {
+    let nsa = document.getElementById('nsa');
+
+    nsa.setAttribute('int', 1);
+    testing.expectEqual('1', nsa.getAttribute('int'));
+
+    nsa.setAttribute('obj', {});
+    testing.expectEqual('[object Object]', nsa.getAttribute('obj'));
+
+    nsa.setAttribute('arr', []);
+    testing.expectEqual('', nsa.getAttribute('arr'));
+  }
+</script>
diff --git a/src/browser/webapi/Element.zig b/src/browser/webapi/Element.zig
index 619d95cd..9e510672 100644
--- a/src/browser/webapi/Element.zig
+++ b/src/browser/webapi/Element.zig
@@ -643,7 +643,7 @@ pub fn setAttributeNS(
     self: *Element,
     maybe_namespace: ?[]const u8,
     qualified_name: []const u8,
-    value: []const u8,
+    value: String,
     page: *Page,
 ) !void {
     if (maybe_namespace) |namespace| {
@@ -656,7 +656,7 @@ pub fn setAttributeNS(
         qualified_name[idx + 1 ..]
     else
         qualified_name;
-    return self.setAttribute(.wrap(local_name), .wrap(value), page);
+    return self.setAttribute(.wrap(local_name), value, page);
 }
 
 pub fn setAttributeSafe(self: *Element, name: String, value: String, page: *Page) !void {
@@ -1528,6 +1528,16 @@ pub const JsApi = struct {
         return null;
     }
 
+    pub const setAttribute = bridge.function(_setAttribute, .{ .dom_exception = true });
+    fn _setAttribute(self: *Element, name: String, value: js.Value, page: *Page) !void {
+        return self.setAttribute(name, .wrap(try value.toString(.{ .allocator = page.call_arena })), page);
+    }
+
+    pub const setAttributeNS = bridge.function(_setAttributeNS, .{ .dom_exception = true });
+    fn _setAttributeNS(self: *Element, maybe_ns: ?[]const u8, qn: []const u8, value: js.Value, page: *Page) !void {
+        return self.setAttributeNS(maybe_ns, qn, .wrap(try value.toString(.{ .allocator = page.call_arena })), page);
+    }
+
     pub const localName = bridge.accessor(Element.getLocalName, null, .{});
     pub const id = bridge.accessor(Element.getId, Element.setId, .{});
     pub const slot = bridge.accessor(Element.getSlot, Element.setSlot, .{});
@@ -1542,8 +1552,6 @@ pub const JsApi = struct {
     pub const getAttribute = bridge.function(Element.getAttribute, .{});
     pub const getAttributeNS = bridge.function(Element.getAttributeNS, .{});
     pub const getAttributeNode = bridge.function(Element.getAttributeNode, .{});
-    pub const setAttribute = bridge.function(Element.setAttribute, .{ .dom_exception = true });
-    pub const setAttributeNS = bridge.function(Element.setAttributeNS, .{ .dom_exception = true });
     pub const setAttributeNode = bridge.function(Element.setAttributeNode, .{});
     pub const removeAttribute = bridge.function(Element.removeAttribute, .{});
     pub const toggleAttribute = bridge.function(Element.toggleAttribute, .{ .dom_exception = true });