1 files changed, 3 insertions, 3 deletions
diff --git a/iphone/Maps/Classes/Components/BorderedButton.swift b/iphone/Maps/Classes/Components/BorderedButton.swift
index 6ea3cf842f..f10e5a4694 100644
--- a/iphone/Maps/Classes/Components/BorderedButton.swift
+++ b/iphone/Maps/Classes/Components/BorderedButton.swift
@@ -19,11 +19,11 @@ final class BorderedButton: UIButton {
 
   private func updateBorder() {
     if !isEnabled {
-      layer.borderColor = borderDisabledColor?.cgColor
+      layer.borderColor = borderDisabledColor?.cgColor ?? titleColor(for: .disabled)?.cgColor
     } else if isHighlighted {
-      layer.borderColor = borderHighlightedColor?.cgColor
+      layer.borderColor = borderHighlightedColor?.cgColor ?? titleColor(for: .highlighted)?.cgColor
     } else {
-      layer.borderColor = borderColor?.cgColor
+      layer.borderColor = borderColor?.cgColor ?? titleColor(for: .normal)?.cgColor
     }
   }