diff --git a/src/utils/mapFieldValues.tsx b/src/utils/mapFieldValues.tsx
index 3d5463f..43b21ae 100644
--- a/src/utils/mapFieldValues.tsx
+++ b/src/utils/mapFieldValues.tsx
@@ -97,18 +97,26 @@ export const mapFieldValues = (
       case "address": {
         const addressValues = field.address?.["--primary"];
 
-        value = `${[
+        if (!addressValues) {
+          value = "";
+
+          break;
+        };
+
+        const addressParts = [
           addressValues.address_1,
           addressValues.address_2,
           addressValues.address_3,
-        ]
-          .filter((e) => e)
-          .join(", ")}, ${addressValues.city}, ${addressValues.state}, ${
-          addressValues.postalCode
-        }, ${addressValues.country}`;
+          addressValues.city,
+          addressValues.state,
+          addressValues.postalCode,
+          addressValues.country
+        ].filter(Boolean);
+
+        value = addressParts.join(", ");
 
         break;
-      }
+      };
 
       case "tags": {
         const usedColorsTags = useMemo(() => {