diff --git a/MVMCoreUI/Atoms/TextFields/MFTextField.m b/MVMCoreUI/Atoms/TextFields/MFTextField.m
index 565e086c..fb157764 100644
--- a/MVMCoreUI/Atoms/TextFields/MFTextField.m
+++ b/MVMCoreUI/Atoms/TextFields/MFTextField.m
@@ -561,7 +561,7 @@
 - (void)setWithJSON:(NSDictionary *)json delegate:(nullable id<UITextFieldDelegate, MFTextFieldDelegate>)delegate additionalData:(NSDictionary *)additionalData {
     [FormValidator setupValidationWithMolecule:self delegate:(id<FormValidationProtocol>)delegate];
     FormValidator *formValidator = [FormValidator getFormValidatorForDelegate:(id<FormValidationProtocol>)delegate];
-    [self setWithMap:json bothDelegates:formValidator];
+    [self setWithMap:json bothDelegates: formValidator ?: delegate ];
 }
 
 #pragma mark - FormValidationProtocol