diff --git a/MVMCoreUI/Models/FormValidator+TextFields.swift b/MVMCoreUI/Models/FormValidator+TextFields.swift
index 04437f0a..2532910d 100644
--- a/MVMCoreUI/Models/FormValidator+TextFields.swift
+++ b/MVMCoreUI/Models/FormValidator+TextFields.swift
@@ -73,10 +73,8 @@ import Foundation
     }
     
     public func entryIsValid(_ textfield: MFTextField?) {
-        DispatchQueue.main.async {
-            self.enableByValidation()
-        }
         MVMCoreDispatchUtility.performBlock(onMainThread: {
+            self.enableByValidation()
             if let delegate = self.delegate as? MFTextFieldDelegate {
                 delegate.entryIsValid?(textfield)
             }
@@ -84,10 +82,8 @@ import Foundation
     }
     
     public func entryIsInvalid(_ textfield: MFTextField?) {
-        DispatchQueue.main.async {
-            self.enableByValidation()
-        }
         MVMCoreDispatchUtility.performBlock(onMainThread: {
+            self.enableByValidation()
             if let delegate = self.delegate as? MFTextFieldDelegate {
                 delegate.entryIsInvalid?(textfield)
             }