diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/RadioSwatchesModel.swift b/MVMCoreUI/Atomic/Atoms/Selectors/RadioSwatchesModel.swift
index ba6cddef..d926ad5c 100644
--- a/MVMCoreUI/Atomic/Atoms/Selectors/RadioSwatchesModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Selectors/RadioSwatchesModel.swift
@@ -87,10 +87,10 @@ import Foundation
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
         try container.encode(color, forKey: .color)
-        try container.encode(text, forKey: .text)
-        try container.encode(selected, forKey: .selected)
-        try container.encode(enabled, forKey: .enabled)
-        try container.encode(strikethrough, forKey: .strikethrough)
+        try container.encodeIfPresent(text, forKey: .text)
+        try container.encodeIfPresent(selected, forKey: .selected)
+        try container.encodeIfPresent(enabled, forKey: .enabled)
+        try container.encodeIfPresent(strikethrough, forKey: .strikethrough)
     }
 }