diff --git a/src/components/compounds/Tag/Tag.vue b/src/components/compounds/Tag/Tag.vue
index 190911c..63ec0c1 100644
--- a/src/components/compounds/Tag/Tag.vue
+++ b/src/components/compounds/Tag/Tag.vue
@@ -8,7 +8,10 @@ const Tag = {
     type: String,
     size: String,
     rounded: Boolean,
-    disabled: Boolean,
+    disabled: {
+      type: Boolean,
+      default: null
+    },
     ellipsis: Boolean,
     tabstop: {
       type: Boolean,
diff --git a/src/components/primitives/Switch/Switch.vue b/src/components/primitives/Switch/Switch.vue
index 0b4ea30..9aa5321 100644
--- a/src/components/primitives/Switch/Switch.vue
+++ b/src/components/primitives/Switch/Switch.vue
@@ -10,7 +10,10 @@ const Switch = {
     nativeValue: {
       type: [String, Number, Boolean, Function, Object, Array, Date],
     },
-    disabled: Boolean,
+    disabled: {
+      type: Boolean,
+      default: null
+    },
     type: String,
     passiveType: String,
     name: String,