diff --git a/MVMCoreUI/Atoms/Views/Checkbox.swift b/MVMCoreUI/Atoms/Views/Checkbox.swift
index 6253b30d..6f308651 100644
--- a/MVMCoreUI/Atoms/Views/Checkbox.swift
+++ b/MVMCoreUI/Atoms/Views/Checkbox.swift
@@ -80,9 +80,9 @@ import MVMCore
     /// Width of the check mark.
     public var checkWidth: CGFloat = 2 {
         didSet {
-            if shapeLayer != nil {
+            if let shapeLayer = shapeLayer {
                 CATransaction.withDisabledAnimations {
-                    shapeLayer?.lineWidth = checkWidth
+                    shapeLayer.lineWidth = checkWidth
                 }
             }
         }
@@ -91,9 +91,9 @@ import MVMCore
     /// Color of the check mark.
     public var checkColor: UIColor = .black {
         didSet {
-            if shapeLayer != nil {
+            if let shapeLayer = shapeLayer {
                 CATransaction.withDisabledAnimations {
-                    shapeLayer?.strokeColor = checkColor.cgColor
+                    shapeLayer.strokeColor = checkColor.cgColor
                 }
             }
         }