diff --git a/d2renderers/d2svg/class.go b/d2renderers/d2svg/class.go
index 01469a037..5ff829178 100644
--- a/d2renderers/d2svg/class.go
+++ b/d2renderers/d2svg/class.go
@@ -93,8 +93,10 @@ func drawClass(writer io.Writer, targetShape d2target.Shape) {
 	el.Height = float64(targetShape.Height)
 	el.Fill, el.Stroke = d2themes.ShapeTheme(targetShape)
 	el.Style = targetShape.CSSStyle()
-	el.Rx = float64(targetShape.BorderRadius)
-	el.Ry = float64(targetShape.BorderRadius)
+	if targetShape.BorderRadius != 0 {
+		el.Rx = float64(targetShape.BorderRadius)
+		el.Ry = float64(targetShape.BorderRadius)
+	}
 	fmt.Fprint(writer, el.Render())
 
 	box := geo.NewBox(
diff --git a/d2renderers/d2svg/table.go b/d2renderers/d2svg/table.go
index 5bebab10f..df356f42e 100644
--- a/d2renderers/d2svg/table.go
+++ b/d2renderers/d2svg/table.go
@@ -121,8 +121,10 @@ func drawTable(writer io.Writer, targetShape d2target.Shape) {
 	rectEl.Fill, rectEl.Stroke = d2themes.ShapeTheme(targetShape)
 	rectEl.ClassName = "shape"
 	rectEl.Style = targetShape.CSSStyle()
-	rectEl.Rx = float64(targetShape.BorderRadius)
-	rectEl.Ry = float64(targetShape.BorderRadius)
+	if targetShape.BorderRadius != 0 {
+		rectEl.Rx = float64(targetShape.BorderRadius)
+		rectEl.Ry = float64(targetShape.BorderRadius)
+	}
 	fmt.Fprint(writer, rectEl.Render())
 
 	box := geo.NewBox(