diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/DigitEntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/DigitEntryField.swift
index 50faacf9..628c7cde 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/DigitEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/DigitEntryField.swift
@@ -35,6 +35,7 @@ import UIKit
                     digitBoxes.append(newDigitBox)
                 }
                 
+                self.digitBoxes.forEach { $0.removeFromSuperview() }
                 self.digitBoxes = digitBoxes
                 guard let space = MFSizeObject(standardSize: 5, smalliPhoneSize: 3)?.getValueBasedOnScreenSize() else { return }
                 
@@ -228,7 +229,7 @@ import UIKit
     //--------------------------------------------------
     
     @objc open override func updateView(_ size: CGFloat) {
-                
+        
         entryFieldContainer.disableAllBorders = true
         
         if !self.digitBoxes.isEmpty {
@@ -245,10 +246,7 @@ import UIKit
         switchFieldsAutomatically = false
         selectedDigitBox = nil
         text = ""
-        digitBoxes.forEach {
-            $0.removeFromSuperview()
-        }
-        digitBoxes = []
+        digitBoxes.forEach { $0.digitField.text = "" }
     }
     
     //--------------------------------------------------
@@ -358,7 +356,7 @@ import UIKit
             $0.digitField.inputAccessoryView = UIToolbar.getToolbarWithDoneButton(delegate: observingDelegate,
                                                                                   action: #selector(observingDelegate.dismissFieldInput))
         }
-            
+        
         super.set(with: model, delegateObject, additionalData)
     }