diff --git a/packages/primevue/src/togglebutton/ToggleButton.vue b/packages/primevue/src/togglebutton/ToggleButton.vue
index 78136ec38..ecf49694d 100755
--- a/packages/primevue/src/togglebutton/ToggleButton.vue
+++ b/packages/primevue/src/togglebutton/ToggleButton.vue
@@ -5,8 +5,9 @@
         :class="cx('root')"
         :tabindex="tabindex"
         :disabled="disabled"
-        :aria-pressed="modelValue"
+        :aria-pressed="d_value"
         @click="onChange"
+        @blur="onBlur"
         v-bind="getPTOptions('root')"
         :aria-labelledby="ariaLabelledby"
         :data-p-checked="active"
@@ -14,8 +15,8 @@
     >
         <span :class="cx('content')" v-bind="getPTOptions('content')">
             <slot>
-                <slot name="icon" :value="modelValue" :class="cx('icon')">
-                    <span v-if="onIcon || offIcon" :class="[cx('icon'), modelValue ? onIcon : offIcon]" v-bind="getPTOptions('icon')" />
+                <slot name="icon" :value="d_value" :class="cx('icon')">
+                    <span v-if="onIcon || offIcon" :class="[cx('icon'), d_value ? onIcon : offIcon]" v-bind="getPTOptions('icon')" />
                 </slot>
                 <span :class="cx('label')" v-bind="getPTOptions('label')">{{ label }}</span>
             </slot>
@@ -32,7 +33,7 @@ export default {
     name: 'ToggleButton',
     extends: BaseToggleButton,
     inheritAttrs: false,
-    emits: ['update:modelValue', 'change'],
+    emits: ['change'],
     methods: {
         getPTOptions(key) {
             const _ptm = key === 'root' ? this.ptmi : this.ptm;
@@ -46,20 +47,23 @@ export default {
         },
         onChange(event) {
             if (!this.disabled && !this.readonly) {
-                this.$emit('update:modelValue', !this.modelValue);
+                this.updateValue(!this.d_value, event);
                 this.$emit('change', event);
             }
+        },
+        onBlur(event) {
+            this.formField.onBlur?.(event);
         }
     },
     computed: {
         active() {
-            return this.modelValue === true;
+            return this.d_value === true;
         },
         hasLabel() {
             return isNotEmpty(this.onLabel) && isNotEmpty(this.offLabel);
         },
         label() {
-            return this.hasLabel ? (this.modelValue ? this.onLabel : this.offLabel) : '&nbsp;';
+            return this.hasLabel ? (this.d_value ? this.onLabel : this.offLabel) : '&nbsp;';
         }
     },
     directives: {
diff --git a/packages/primevue/src/togglebutton/style/ToggleButtonStyle.js b/packages/primevue/src/togglebutton/style/ToggleButtonStyle.js
index fd9a04e1a..8ee5d7053 100644
--- a/packages/primevue/src/togglebutton/style/ToggleButtonStyle.js
+++ b/packages/primevue/src/togglebutton/style/ToggleButtonStyle.js
@@ -106,7 +106,7 @@ const classes = {
         'p-togglebutton p-component',
         {
             'p-togglebutton-checked': instance.active,
-            'p-invalid': props.invalid
+            'p-invalid': instance.$invalid
         }
     ],
     content: 'p-togglebutton-content',
diff --git a/packages/primevue/src/toggleswitch/BaseToggleSwitch.vue b/packages/primevue/src/toggleswitch/BaseToggleSwitch.vue
index 1d34fb03e..473c7e302 100644
--- a/packages/primevue/src/toggleswitch/BaseToggleSwitch.vue
+++ b/packages/primevue/src/toggleswitch/BaseToggleSwitch.vue
@@ -1,15 +1,11 @@
 <script>
-import BaseComponent from '@primevue/core/basecomponent';
+import BaseEditableHolder from '@primevue/core/baseeditableholder';
 import ToggleSwitchStyle from 'primevue/toggleswitch/style';
 
 export default {
     name: 'BaseToggleSwitch',
-    extends: BaseComponent,
+    extends: BaseEditableHolder,
     props: {
-        modelValue: {
-            type: null,
-            default: false
-        },
         trueValue: {
             type: null,
             default: true
@@ -18,14 +14,6 @@ export default {
             type: null,
             default: false
         },
-        invalid: {
-            type: Boolean,
-            default: false
-        },
-        disabled: {
-            type: Boolean,
-            default: false
-        },
         readonly: {
             type: Boolean,
             default: false