diff --git a/src-docs/src/views/form_controls/playground.js b/src-docs/src/views/form_controls/playground.js
index b631aa7b5ac..178f891193a 100644
--- a/src-docs/src/views/form_controls/playground.js
+++ b/src-docs/src/views/form_controls/playground.js
@@ -12,6 +12,7 @@ import {
   EuiTextArea,
   EuiCheckbox,
   EuiRadio,
+  EuiSwitch,
 } from '../../../../src/components/';
 import { PropTypes } from 'react-view';
 
@@ -318,6 +319,44 @@ export const radioConfig = () => {
   };
 };
 
+const switchConfig = () => {
+  const docgenInfo = Array.isArray(EuiSwitch.__docgenInfo)
+    ? EuiSwitch.__docgenInfo[0]
+    : EuiSwitch.__docgenInfo;
+  const propsToUse = propUtilityForPlayground(docgenInfo.props);
+
+  propsToUse.label = {
+    ...propsToUse.label,
+    type: PropTypes.String,
+    value: 'Label',
+  };
+
+  propsToUse.checked = {
+    ...propsToUse.checked,
+    value: true,
+  };
+
+  propsToUse.onChange = simulateFunction(propsToUse.onChange);
+
+  return {
+    config: {
+      componentName: 'EuiSwitch',
+      props: propsToUse,
+      scope: {
+        EuiSwitch,
+      },
+      imports: {
+        '@elastic/eui': {
+          named: ['EuiSwitch'],
+        },
+      },
+      customProps: {
+        onChange: dummyFunction,
+      },
+    },
+  };
+};
+
 export default [
   fieldTextConfig,
   fieldSearchConfig,
@@ -326,4 +365,5 @@ export default [
   textAreaConfig,
   checkboxConfig,
   radioConfig,
+  switchConfig,
 ];
diff --git a/src/components/form/switch/switch.tsx b/src/components/form/switch/switch.tsx
index 7be319f7ba4..629f64e871f 100644
--- a/src/components/form/switch/switch.tsx
+++ b/src/components/form/switch/switch.tsx
@@ -104,7 +104,7 @@ export const EuiSwitch: FunctionComponent<EuiSwitchProps> = ({
     <div className={classes}>
       <button
         id={switchId}
-        aria-checked={checked}
+        aria-checked={checked || false}
         className="euiSwitch__button"
         role="switch"
         type={type}