diff --git a/src/components/ha-form/ha-form-grid.ts b/src/components/ha-form/ha-form-grid.ts
index c9fccfe4f3..2ccb082c8a 100644
--- a/src/components/ha-form/ha-form-grid.ts
+++ b/src/components/ha-form/ha-form-grid.ts
@@ -33,11 +33,6 @@ export class HaFormGrid extends LitElement implements HaFormElement {
 
   @property() public computeHelper?: (schema: HaFormSchema) => string;
 
-  protected firstUpdated(changedProps: PropertyValues) {
-    super.firstUpdated(changedProps);
-    this.setAttribute("own-margin", "");
-  }
-
   protected updated(changedProps: PropertyValues): void {
     super.updated(changedProps);
     if (changedProps.has("schema")) {
@@ -78,7 +73,8 @@ export class HaFormGrid extends LitElement implements HaFormElement {
           var(--form-grid-column-count, auto-fit),
           minmax(var(--form-grid-min-width, 200px), 1fr)
         );
-        grid-gap: 8px;
+        grid-column-gap: 8px;
+        grid-row-gap: 24px;
       }
       :host > ha-form {
         display: block;