diff --git a/VDS/Components/Toggle/Toggle.swift b/VDS/Components/Toggle/Toggle.swift
index 29f7dd6d..260fdc31 100644
--- a/VDS/Components/Toggle/Toggle.swift
+++ b/VDS/Components/Toggle/Toggle.swift
@@ -157,13 +157,11 @@ open class Toggle: Control, Changeable, FormFieldable {
     /// Called once when a view is initialized and is used to Setup additional UI or other constants and configurations.
     open override func setup() {
         super.setup()
-
-        publisher(for: .touchUpInside)
-            .sink(receiveValue: { [weak self] _ in
-                guard let self, isEnabled else { return }
-                toggle()
-            })
-            .store(in: &subscribers)
+     
+        onClick = { [weak self] _ in
+            guard let self else { return }
+            toggle()
+        }
 
         isAccessibilityElement = true
         if #available(iOS 17.0, *) {
diff --git a/VDS/Components/Toggle/ToggleView.swift b/VDS/Components/Toggle/ToggleView.swift
index fb663e99..1ba5d605 100644
--- a/VDS/Components/Toggle/ToggleView.swift
+++ b/VDS/Components/Toggle/ToggleView.swift
@@ -109,12 +109,10 @@ open class ToggleView: Control, Changeable, FormFieldable {
     open override func setup() {
         super.setup()
         
-        publisher(for: .touchUpInside)
-            .sink(receiveValue: { [weak self] _ in
-                guard let self, isEnabled else { return }
-                toggle()
-            })
-            .store(in: &subscribers)
+        onClick = { [weak self] _ in
+            guard let self else { return }
+            toggle()
+        }
 
         isAccessibilityElement = true
         if #available(iOS 17.0, *) {