diff --git a/MVMCoreUI/BaseClasses/TextViewModel.swift b/MVMCoreUI/BaseClasses/TextViewModel.swift
index 1972e60f..49ac664c 100644
--- a/MVMCoreUI/BaseClasses/TextViewModel.swift
+++ b/MVMCoreUI/BaseClasses/TextViewModel.swift
@@ -83,9 +83,9 @@ open class TextViewModel: TextEntryFieldModel {
     public override func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encodeIfPresent(accessibilityText, forKey: .accessibilityText)
-        try container.encodeIfPresent(fontStyle, forKey: .fontStyle)
         try container.encodeIfPresent(height, forKey: .height)
-        try container.encodeIfPresent(hideBorders, forKey: .hideBorders)
+        try container.encode(fontStyle, forKey: .fontStyle)
+        try container.encode(hideBorders, forKey: .hideBorders)
         try container.encode(text, forKey: .text)
         try container.encode(placeholderFontStyle, forKey: .placeholderFontStyle)
         try container.encode(placeholderTextColor, forKey: .placeholderTextColor)