diff --git a/COMPONENT_INDEX.md b/COMPONENT_INDEX.md
index 16a4c0a4..6ed4788d 100644
--- a/COMPONENT_INDEX.md
+++ b/COMPONENT_INDEX.md
@@ -1406,12 +1406,13 @@ None.
 
 ### Props
 
-| Prop name   | Kind             | Reactive | Type                 | Default value      | Description                                |
-| :---------- | :--------------- | :------- | :------------------- | ------------------ | ------------------------------------------ |
-| invalid     | <code>let</code> | No       | <code>boolean</code> | <code>false</code> | Set to `true` to indicate an invalid state |
-| message     | <code>let</code> | No       | <code>boolean</code> | <code>false</code> | Set to `true` to render a form requirement |
-| messageText | <code>let</code> | No       | <code>string</code>  | <code>""</code>    | Specify the message text                   |
-| legendText  | <code>let</code> | No       | <code>string</code>  | <code>""</code>    | Specify the legend text                    |
+| Prop name   | Kind             | Reactive | Type                 | Default value      | Description                                   |
+| :---------- | :--------------- | :------- | :------------------- | ------------------ | --------------------------------------------- |
+| invalid     | <code>let</code> | No       | <code>boolean</code> | <code>false</code> | Set to `true` to indicate an invalid state    |
+| message     | <code>let</code> | No       | <code>boolean</code> | <code>false</code> | Set to `true` to render a form requirement    |
+| noMargin    | <code>let</code> | No       | <code>boolean</code> | <code>false</code> | Set to `true` for to remove the bottom margin |
+| messageText | <code>let</code> | No       | <code>string</code>  | <code>""</code>    | Specify the message text                      |
+| legendText  | <code>let</code> | No       | <code>string</code>  | <code>""</code>    | Specify the legend text                       |
 
 ### Slots
 
diff --git a/docs/src/COMPONENT_API.json b/docs/src/COMPONENT_API.json
index ffe074e4..e1353c54 100644
--- a/docs/src/COMPONENT_API.json
+++ b/docs/src/COMPONENT_API.json
@@ -3514,6 +3514,16 @@
           "constant": false,
           "reactive": false
         },
+        {
+          "name": "noMargin",
+          "kind": "let",
+          "description": "Set to `true` for to remove the bottom margin",
+          "type": "boolean",
+          "value": "false",
+          "isFunction": false,
+          "constant": false,
+          "reactive": false
+        },
         {
           "name": "messageText",
           "kind": "let",
diff --git a/src/FormGroup/FormGroup.svelte b/src/FormGroup/FormGroup.svelte
index f7108587..2c3bb40d 100644
--- a/src/FormGroup/FormGroup.svelte
+++ b/src/FormGroup/FormGroup.svelte
@@ -5,6 +5,9 @@
   /** Set to `true` to render a form requirement */
   export let message = false;
 
+  /** Set to `true` for to remove the bottom margin */
+  export let noMargin = false;
+
   /** Specify the message text */
   export let messageText = "";
 
@@ -15,6 +18,7 @@
 <fieldset
   data-invalid="{invalid || undefined}"
   class:bx--fieldset="{true}"
+  class:bx--fieldset--no-margin="{noMargin}"
   {...$$restProps}
   on:click
   on:mouseover
diff --git a/types/FormGroup/FormGroup.d.ts b/types/FormGroup/FormGroup.d.ts
index 8c7e45b8..a9e7dd5b 100644
--- a/types/FormGroup/FormGroup.d.ts
+++ b/types/FormGroup/FormGroup.d.ts
@@ -15,6 +15,12 @@ export interface FormGroupProps
    */
   message?: boolean;
 
+  /**
+   * Set to `true` for to remove the bottom margin
+   * @default false
+   */
+  noMargin?: boolean;
+
   /**
    * Specify the message text
    * @default ""