diff --git a/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift b/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift
index 2e50dfca..87373ff4 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift
@@ -392,8 +392,23 @@ public typealias ActionBlockConfirmation = () -> (Bool)
             accessibilityLabel = accessibileString
         }
         
-        if let actionMap = model.action?.toJSON() {
-            didToggleAction = { MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalData, delegateObject: delegateObject) }
+        let actionMap = model.action?.toJSON()
+        let alternateActionMap = model.alternateAction?.toJSON()
+        if actionMap != nil || alternateActionMap != nil {
+            didToggleAction = { [weak self] in
+                guard let strongSelf = self else { return }
+                if strongSelf.isOn {
+                    if actionMap != nil {
+                        MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalData, delegateObject: delegateObject)
+                    }
+                } else {
+                    if alternateActionMap != nil {
+                         MVMCoreActionHandler.shared()?.handleAction(with: alternateActionMap, additionalData: additionalData, delegateObject: delegateObject)
+                    } else if actionMap != nil {
+                        MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalData, delegateObject: delegateObject)
+                    }
+                }
+            }
         }
     }