diff --git a/VDS/Components/BadgeIndicator/BadgeIndicator.swift b/VDS/Components/BadgeIndicator/BadgeIndicator.swift
index 511f9b61..0bafa46d 100644
--- a/VDS/Components/BadgeIndicator/BadgeIndicator.swift
+++ b/VDS/Components/BadgeIndicator/BadgeIndicator.swift
@@ -272,12 +272,15 @@ open class BadgeIndicator: View {
     private func getText() -> String {
         let badgeCount = number ?? 0
         var text: String = ""
-        if kind == .numbered {
+        if kind == .numbered && badgeCount >= 0 {
             let maxBadgetCount = limitDigits(number: badgeCount, maxDigits: maxDigits.value)
-            
-            text = "\(maxBadgetCount)"
+            let formatter = NumberFormatter()
+            formatter.numberStyle = .decimal
+            text = formatter.string(from: .init(integerLiteral: maxBadgetCount))!
             if maxDigits.value < "\(badgeCount)".count {
-                text = "\(maxBadgetCount)+"
+                let formatter = NumberFormatter()
+                formatter.numberStyle = .decimal
+                text = "\(text)+"
             }
             if let leadingCharacter {
                 text = "\(leadingCharacter)\(text)"