diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift
index bc3e9617..95f15e06 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift
@@ -315,7 +315,9 @@ import UIKit
                     self.showError = false
                 }
                 self.isEnabled = model.enabled
-                self.text = model.text
+                if let text = model.text, !text.isEmpty {
+                    self.text = model.text
+                }
             })
         }