diff --git a/api-generator/components/checkbox.js b/api-generator/components/checkbox.js
index d28a4e59a..d98987487 100644
--- a/api-generator/components/checkbox.js
+++ b/api-generator/components/checkbox.js
@@ -32,13 +32,13 @@ const CheckboxProps = [
     {
         name: "trueValue",
         type: "any",
-        default: "true",
+        default: "null",
         description: "Value in checked state."
     },
     {
         name: "falseValue",
         type: "any",
-        default: "true",
+        default: "null",
         description: "Value in unchecked state."
     }
 ];
diff --git a/api-generator/components/inputswitch.js b/api-generator/components/inputswitch.js
index 704ef145f..b05d8b32d 100644
--- a/api-generator/components/inputswitch.js
+++ b/api-generator/components/inputswitch.js
@@ -20,13 +20,13 @@ const InputSwitchProps = [
     {
         name: "trueValue",
         type: "any",
-        default: "true",
+        default: "null",
         description: "Value in checked state."
     },
     {
         name: "falseValue",
         type: "any",
-        default: "true",
+        default: "null",
         description: "Value in unchecked state."
     }
 ];