diff --git a/VDS/Components/Toggle/Toggle.swift b/VDS/Components/Toggle/Toggle.swift
index e4390683..29f7dd6d 100644
--- a/VDS/Components/Toggle/Toggle.swift
+++ b/VDS/Components/Toggle/Toggle.swift
@@ -160,7 +160,7 @@ open class Toggle: Control, Changeable, FormFieldable {
 
         publisher(for: .touchUpInside)
             .sink(receiveValue: { [weak self] _ in
-                guard let self else { return }
+                guard let self, isEnabled else { return }
                 toggle()
             })
             .store(in: &subscribers)
diff --git a/VDS/Components/Toggle/ToggleView.swift b/VDS/Components/Toggle/ToggleView.swift
index a0dbcda4..fb663e99 100644
--- a/VDS/Components/Toggle/ToggleView.swift
+++ b/VDS/Components/Toggle/ToggleView.swift
@@ -111,7 +111,7 @@ open class ToggleView: Control, Changeable, FormFieldable {
         
         publisher(for: .touchUpInside)
             .sink(receiveValue: { [weak self] _ in
-                guard let self else { return }
+                guard let self, isEnabled else { return }
                 toggle()
             })
             .store(in: &subscribers)