diff --git a/VDS/Components/RadioSwatch/RadioSwatchGroup.swift b/VDS/Components/RadioSwatch/RadioSwatchGroup.swift
index bd89d8fa..7fef37b5 100644
--- a/VDS/Components/RadioSwatch/RadioSwatchGroup.swift
+++ b/VDS/Components/RadioSwatch/RadioSwatchGroup.swift
@@ -27,7 +27,7 @@ public class RadioSwatchGroup: RadioSwatchGroupBase<DefaultRadioSwatchGroupModel
         
         label.text = newSelectedModel.text
         replace(viewModel: newSelectedModel)
-        selectedInputId = newSelectedModel.inputId
+        sendActions(for: .valueChanged)
     }
     
 }
@@ -37,22 +37,8 @@ public class RadioSwatchGroupBase<GroupModelType: RadioSwatchGroupModel, ModelHa
     //--------------------------------------------------
     // MARK: - Public Properties
     //--------------------------------------------------
-    @Proxy(\.model.selectedInputId)
-    public var selectedInputId: String? {
-        didSet {
-            sendActions(for: .valueChanged)
-        }
-    }
-    
     public var selectedModel: ModelHandlerType.ModelType? {
-        guard let selectedInputId else { return nil }
-        if let  index = model.selectors.firstIndex(where: { element in
-            return element.inputId == selectedInputId
-        }) {
-            return model.selectors[index]
-        } else {
-            return nil
-        }
+        return model.selectedModel
     }
 
     public var onChange: Blocks.ActionBlock?
diff --git a/VDS/Components/RadioSwatch/RadioSwatchGroupModel.swift b/VDS/Components/RadioSwatch/RadioSwatchGroupModel.swift
index c7aae431..b379c970 100644
--- a/VDS/Components/RadioSwatch/RadioSwatchGroupModel.swift
+++ b/VDS/Components/RadioSwatch/RadioSwatchGroupModel.swift
@@ -28,7 +28,6 @@ public struct DefaultRadioSwatchGroupModel: RadioSwatchGroupModel {
     public var surface: Surface = .light
     public var disabled: Bool = false
     public var selectors: [SelectorModelType]
-    public var selectedInputId: String?
     public init() { selectors = [] }
     public init(selectors: [SelectorModelType]){
         self.selectors = selectors
diff --git a/VDS/Protocols/SelectorGroupModelable.swift b/VDS/Protocols/SelectorGroupModelable.swift
index 48ff392d..306e3d06 100644
--- a/VDS/Protocols/SelectorGroupModelable.swift
+++ b/VDS/Protocols/SelectorGroupModelable.swift
@@ -15,15 +15,13 @@ public protocol SelectorGroupModelable: Modelable, FormFieldable {
 
 ///MARK:  Groups that allow single selections
 public protocol SelectorGroupSelectedModelable: SelectorGroupModelable {
-    var selectedInputId: String? { get set }
     var selectedModel: SelectorModelType? { get }
 }
 
 extension SelectorGroupSelectedModelable {
     public var selectedModel: SelectorModelType? {
-        guard let selectedInputId else { return nil }
         if let  index = selectors.firstIndex(where: { element in
-            return element.inputId == selectedInputId
+            return element.selected == true
         }) {
             return selectors[index]
         } else {