diff --git a/MVMCoreUI/Atomic/Atoms/Buttons/RadioButtonSelectionHelper.swift b/MVMCoreUI/Atomic/Atoms/Buttons/RadioButtonSelectionHelper.swift
index 2273785f..60c79465 100644
--- a/MVMCoreUI/Atomic/Atoms/Buttons/RadioButtonSelectionHelper.swift
+++ b/MVMCoreUI/Atomic/Atoms/Buttons/RadioButtonSelectionHelper.swift
@@ -19,7 +19,8 @@ import UIKit
     public func set(_ radioButtonModel: RadioButtonModel, _ radioButton: RadioButton) {
         self.fieldKey = radioButtonModel.fieldKey
         if radioButtonModel.state {
-            if self.baseValue == nil {
+            if self.baseValue == nil,
+                let selected = radioButtonModel.baseValue as? Bool, selected {
                 self.baseValue = radioButtonModel.fieldValue
             }
             selectedRadioButtonModel = radioButtonModel