diff --git a/src/layouts/tpa-search/tpa-search.spec.js b/src/layouts/tpa-search/tpa-search.spec.js
index 5687b9ca..1e1b1945 100644
--- a/src/layouts/tpa-search/tpa-search.spec.js
+++ b/src/layouts/tpa-search/tpa-search.spec.js
@@ -177,7 +177,7 @@ describe('TPA search page', () => {
             // Assert
             expect(map.exists()).toBeTruthy();
             expect(map.classes()).toContain('mb-4');
-            expect(map.props().addresses).toEqual(expectedAddresses);
+            expect(map.props().providers.map(p => p.fullAddress)).toEqual(expectedAddresses);
             expect(map.props().zipCode).toBe(zipCode);
         });
         test('search radius filter', async () => {
@@ -582,7 +582,7 @@ describe('TPA search page', () => {
                 ];
 
                 // Act
-                const result = wrapper.vm.providerAddresses;
+                const result = wrapper.vm.providerAddresses.map(pa => pa.fullAddress);
 
                 // Assert
                 expect(result).toEqual(expectedResult);
@@ -1015,6 +1015,33 @@ describe('TPA search page', () => {
             ['address', 'city', null, 'zip', 'Address, City zip'],
             ['address', 'city', 'ST', null, 'Address, City, ST'],
             [null, null, null, null, '']
+        ])(
+            'getFullProviderAddress returns expected',
+            (streetAddress, city, state, zipCode, expected) => {
+                // Arrange
+                const { wrapper } = getMountedComponent();
+                const provider = {
+                    address: {
+                        streetAddress,
+                        city,
+                        state,
+                        zipCode
+                    }
+                };
+
+                // Act
+                const result = wrapper.vm.getFullProviderAddress(provider);
+
+                // Assert
+                expect(result).toEqual(expected);
+            }
+        );
+        test.each([
+            ['address', 'city', 'ST', 'zip', 'Address'],
+            ['address', null, 'ST', 'zip', 'Address'],
+            ['address', 'city', null, 'zip', 'Address'],
+            ['address', 'city', 'ST', null, 'Address'],
+            [null, null, null, null, '']
         ])(
             'getProviderAddress returns expected',
             (streetAddress, city, state, zipCode, expected) => {
@@ -1036,6 +1063,33 @@ describe('TPA search page', () => {
                 expect(result).toEqual(expected);
             }
         );
+        test.each([
+            ['address', 'city', 'ST', 'zip', 'City, ST zip'],
+            ['address', null, 'ST', 'zip', 'ST zip'],
+            ['address', 'city', null, 'zip', 'City zip'],
+            ['address', 'city', 'ST', null, 'City, ST'],
+            [null, null, null, null, '']
+        ])(
+            'getProviderCityZipState returns expected',
+            (streetAddress, city, state, zipCode, expected) => {
+                // Arrange
+                const { wrapper } = getMountedComponent();
+                const provider = {
+                    address: {
+                        streetAddress,
+                        city,
+                        state,
+                        zipCode
+                    }
+                };
+
+                // Act
+                const result = wrapper.vm.getProviderCityZipState(provider);
+
+                // Assert
+                expect(result).toEqual(expected);
+            }
+        );
         describe('getProviderButtonData', () => {
             test.each([null, undefined, {}])(
                 'returns empty list when getTpaProviders returns no data',
diff --git a/src/layouts/tpa-search/tpa-search.vue b/src/layouts/tpa-search/tpa-search.vue
index e384eec2..c5b9e22c 100644
--- a/src/layouts/tpa-search/tpa-search.vue
+++ b/src/layouts/tpa-search/tpa-search.vue
@@ -431,7 +431,7 @@ export default {
             return {
                 buttonLabel: provider?.companyName ?? '',
                 buttonLabelSubCopy: distance === null ? '' : `${distance} mi`,
-                buttonBodyCopy: `${this.getProviderAddress(provider)}<br>${
+                buttonBodyCopy: `${this.getFullProviderAddress(provider)}<br>${
                     cellNumber ?? ''
                 }`,
                 value: provider?.providerNumber ?? ''