diff --git a/lib/utils/formatting.dart b/lib/utils/formatting.dart
index 31fd0b768..b4fdfb465 100644
--- a/lib/utils/formatting.dart
+++ b/lib/utils/formatting.dart
@@ -269,8 +269,16 @@ String formatAddress(
     str += address2 + delimiter;
   }
 
-  if (city.isNotEmpty || state.isNotEmpty || postalCode.isNotEmpty) {
-    str += city + ',' + state + ' ' + postalCode;
+  if (city.isNotEmpty) {
+    str += city + ', ';
+  }
+
+  if (state.isNotEmpty) {
+    str += state + ' ';
+  }
+
+  if (postalCode.isNotEmpty) {
+    str += postalCode;
   }
 
   return str;