diff --git a/cardinal-android/app/src/main/java/earth/maps/cardinal/data/AddressFormatter.kt b/cardinal-android/app/src/main/java/earth/maps/cardinal/data/AddressFormatter.kt
index cbdcb5455caa99a9a9789a0c797bbe02fdfed90b..8935340d6c72c121e84aafe6f0b5406395739644 100644
--- a/cardinal-android/app/src/main/java/earth/maps/cardinal/data/AddressFormatter.kt
+++ b/cardinal-android/app/src/main/java/earth/maps/cardinal/data/AddressFormatter.kt
@@ -27,12 +27,18 @@ import javax.inject.Singleton
 
 @Singleton
 class AddressFormatter @Inject constructor() {
-    private val formatter = AndroidAddressFormatter(true, true, false)
+    private val countryFormatter = AndroidAddressFormatter(true, true, false)
+    private val noCountryFormatter = AndroidAddressFormatter(true, false, false)
 
     fun format(address: Address): String? {
         try {
             val locale = Locale.getDefault()
             val fallbackCountryCode = locale.country.uppercase()
+            val formatter = if (address.countryCode != null) {
+                countryFormatter
+            } else {
+                noCountryFormatter
+            }
             return formatter.format(
                 Gson().toJson(
                     mapOf(