diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc
index 3e0bb172e0..4f94a57691 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc
@@ -31,9 +31,7 @@
         <li class="patroncity">
             <span class="city">[%~ patron.city |html ~%]</span>
             [%~ IF ( patron.state ) %]
-                [%~ IF ( patron.city ) ~%]
-                    ,
-                [% END ~%]
+                [%~ IF ( patron.city ) ~%][% ", " | $raw %][% END ~%]
                 <span class="state">[% patron.state |html ~%]</span>
             [%~ END ~%]
             [%~ IF ( patron.zipcode ) %]<span class="zipcode">[%~ " " _ patron.zipcode |html ~%]</span>[% END %]
diff --git a/t/cypress/integration/Patron/Address.ts b/t/cypress/integration/Patron/Address.ts
new file mode 100644
index 0000000000..1d09a43690
--- /dev/null
+++ b/t/cypress/integration/Patron/Address.ts
@@ -0,0 +1,44 @@
+describe("Display address", () => {
+    beforeEach(() => {
+        cy.login();
+        cy.title().should("eq", "Koha staff interface");
+        cy.task("buildSampleObject", {
+            object: "patron",
+            values: {
+                street_number: 12,
+                street_type: "Rd",
+                address: "Awesome",
+                address2: "Library",
+                city: "Portland",
+                state: "OR",
+                postal_code: "44240",
+                country: "USA",
+            },
+        }).then(generatedPatron => {
+            cy.task("insertObject", {
+                type: "patron",
+                object: generatedPatron,
+            }).then(objects_patron => {
+                cy.wrap(objects_patron).as("objects_patron");
+            });
+        });
+    });
+
+    afterEach(function () {
+        cy.task("deleteSampleObjects", [this.objects_patron]);
+    });
+
+    it("should have correct spacing", function () {
+        cy.visit(
+            `/cgi-bin/koha/members/moremember.pl?borrowernumber=${this.objects_patron.patron_id}`
+        );
+        const patron = this.objects_patron;
+        cy.get(".patronbriefinfo").should($el => {
+            const re = new RegExp(
+                `${patron.street_number} ${patron.address} ${patron.street_type}\\n\\s*${patron.address2}\\n\\s*${patron.city}, ${patron.state} ${patron.postal_code}\\n\\s*${patron.country}`
+            );
+            const displayedText = $el.text().replace(/ /g, " ").trim();
+            expect(displayedText).to.match(re);
+        });
+    });
+});