diff --git a/src/bootstrap/Switch.js b/src/bootstrap/Switch.js
index de5180e..e101e0a 100644
--- a/src/bootstrap/Switch.js
+++ b/src/bootstrap/Switch.js
@@ -19,15 +19,16 @@ Switch.propTypes = {
     ]).isRequired,
     helpText: PropTypes.string,
     switchHeading: PropTypes.bool,
+    className: PropTypes.string,
 };
 
-function Switch({ label, helpText, switchHeading, ...props }) {
+function Switch({ label, helpText, switchHeading, className, ...props }) {
     const uid = useUID();
 
     return (
         <div
-            className={`form-check form-switch mb-3 ${
-                switchHeading ? "d-flex align-items-center" : null
+            className={`form-check form-switch ${className || "mb-3"} ${
+                switchHeading ? "d-flex align-items-center" : ""
             }`.trim()}
         >
             <input
diff --git a/src/bootstrap/__tests__/__snapshots__/Switch.test.js.snap b/src/bootstrap/__tests__/__snapshots__/Switch.test.js.snap
index c962d21..ae6f4ba 100644
--- a/src/bootstrap/__tests__/__snapshots__/Switch.test.js.snap
+++ b/src/bootstrap/__tests__/__snapshots__/Switch.test.js.snap
@@ -2,7 +2,7 @@
 
 exports[`<Switch/> Render switch 1`] = `
 <div
-  class="form-check form-switch mb-3 null"
+  class="form-check form-switch mb-3"
 >
   <input
     checked=""
@@ -29,7 +29,7 @@ exports[`<Switch/> Render switch 1`] = `
 
 exports[`<Switch/> Render uncheked switch 1`] = `
 <div
-  class="form-check form-switch mb-3 null"
+  class="form-check form-switch mb-3"
 >
   <input
     class="form-check-input"
diff --git a/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap b/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap
index 51cbadf..4457b1a 100644
--- a/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap
+++ b/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap
@@ -536,7 +536,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +         </div>
 +       </div>
 +       <div
-+         class="form-check form-switch mb-3 null"
++         class="form-check form-switch mb-3"
 +       >
 +         <input
 +           class="form-check-input"
@@ -920,7 +920,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +         </div>
 +       </div>
 +       <div
-+         class="form-check form-switch mb-3 null"
++         class="form-check form-switch mb-3"
 +       >
 +         <input
 +           class="form-check-input"
@@ -943,7 +943,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +         </div>
 +       </div>
 +       <div
-+         class="form-check form-switch mb-3 null"
++         class="form-check form-switch mb-3"
 +       >
 +         <input
 +           class="form-check-input"