diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/ToggleModel.swift b/MVMCoreUI/Atomic/Atoms/Selectors/ToggleModel.swift
index 1389b11e..84bc25aa 100644
--- a/MVMCoreUI/Atomic/Atoms/Selectors/ToggleModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Selectors/ToggleModel.swift
@@ -83,9 +83,7 @@ public class ToggleModel: MoleculeModelProtocol, FormFieldProtocol {
         accessibilityText = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityText)
         baseValue = selected
         fieldKey = try typeContainer.decodeIfPresent(String.self, forKey: .fieldKey)
-        if let gName = try typeContainer.decodeIfPresent(String.self, forKey: .groupName) {
-            groupName = gName
-        }
+        groupName = try typeContainer.decodeIfPresent(String.self, forKey: .groupName) ?? FormValidator.defaultGroupName
         enabled = try typeContainer.decodeIfPresent(Bool.self, forKey: .enabled) ?? true
         readOnly = try typeContainer.decodeIfPresent(Bool.self, forKey: .readOnly) ?? false
         animated = try typeContainer.decodeIfPresent(Bool.self, forKey: .animated) ?? true