diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
index 41254355..5b131fe6 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
@@ -283,9 +283,10 @@ import UIKit
             return
         }
 
-        if let isValid = (model as? TextEntryFieldModel)?.isValid {
+        if let isValid = textEntryFieldModel?.isValid {
             self.isValid = isValid
         }
+        
         shouldShowError(!isValid)
     }
     
diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/TextViewEntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/TextViewEntryField.swift
index 35e25075..9cbf2c57 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/TextViewEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/TextViewEntryField.swift
@@ -216,7 +216,7 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
             return
         }
 
-        if let isValid = (model as? TextEntryFieldModel)?.isValid {
+        if let isValid = textViewEntryFieldModel?.isValid {
             self.isValid = isValid
         }