diff --git a/VDS/Components/TextFields/InputField/FieldTypes/CreditCard.swift b/VDS/Components/TextFields/InputField/FieldTypes/CreditCard.swift
index bc3a289a..b0e8a165 100644
--- a/VDS/Components/TextFields/InputField/FieldTypes/CreditCard.swift
+++ b/VDS/Components/TextFields/InputField/FieldTypes/CreditCard.swift
@@ -254,7 +254,7 @@ extension InputField {
             let rawNumber = number.filter { $0.isNumber }
             guard rawNumber.count == cardType.maxLength else { return formatCreditCardNumber(cardType, number: number) }
             let lastFourDigits = rawNumber.suffix(4)
-            let maskedSection = String(repeating: "•", count: 12)
+            let maskedSection = String(repeating: "•", count: number.count - lastFourDigits.count)
             let formattedMaskSection = String.format(maskedSection, indices: cardType.separatorIndices(rawNumber.count), with: " ")
             return formattedMaskSection + " " + lastFourDigits
         }