diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/Checkbox.swift b/MVMCoreUI/Atomic/Atoms/Selectors/Checkbox.swift
index 572a075b..64224f04 100644
--- a/MVMCoreUI/Atomic/Atoms/Selectors/Checkbox.swift
+++ b/MVMCoreUI/Atomic/Atoms/Selectors/Checkbox.swift
@@ -143,7 +143,8 @@ import VDS
             MVMCoreDispatchUtility.performBlock(onMainThread: { [weak self] in
                 guard let self = self else { return }
                 let isValid = viewModel.isValid ?? true
-                showError = !isValid
+                //TODO: Fix issue with default state
+                //showError = !isValid
                 isEnabled = viewModel.enabled
 
             })
diff --git a/MVMCoreUI/Atomic/Atoms/Views/CheckboxLabel.swift b/MVMCoreUI/Atomic/Atoms/Views/CheckboxLabel.swift
index 32e88bf2..3e02b467 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/CheckboxLabel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/CheckboxLabel.swift
@@ -75,7 +75,8 @@ import VDS
             MVMCoreDispatchUtility.performBlock(onMainThread: { [weak self] in
                 guard let self = self else { return }
                 let isValid = viewModel.checkbox.isValid ?? true
-                showError = !isValid
+                //TODO: Fix issue with default state
+                //showError = !isValid
                 errorText = viewModel.checkbox.errorMessage
                 isEnabled = viewModel.checkbox.enabled
             })