diff --git a/d2layouts/d2grid/grid_diagram.go b/d2layouts/d2grid/grid_diagram.go
index 264bc07cc..3144ac1ed 100644
--- a/d2layouts/d2grid/grid_diagram.go
+++ b/d2layouts/d2grid/grid_diagram.go
@@ -64,6 +64,14 @@ func newGridDiagram(root *d2graph.Object) *gridDiagram {
 		}
 	} else if gd.columns == 0 {
 		gd.rowDirected = true
+		// we can only make N rows with N objects
+		if len(gd.objects) < gd.rows {
+			gd.rows = len(gd.objects)
+		}
+	} else {
+		if len(gd.objects) < gd.columns {
+			gd.columns = len(gd.objects)
+		}
 	}
 
 	return &gd