diff --git a/src/models/view/identityView.ts b/src/models/view/identityView.ts
index 65fdbcde0e2..487a59bf1a8 100644
--- a/src/models/view/identityView.ts
+++ b/src/models/view/identityView.ts
@@ -108,8 +108,13 @@ export class IdentityView implements View {
             return null;
         }
         const city = this.city || '-';
-        const state = this.state || '-';
+        const state = this.state;
         const postalCode = this.postalCode || '-';
-        return city + ', ' + state + ', ' + postalCode;
+        let addressPart2 = city;
+        if (!Utils.isNullOrWhitespace(state)) {
+            addressPart2 += ', ' + state;
+        }
+        addressPart2 += ', ' + postalCode;
+        return addressPart2;
     }
 }