diff --git a/src/layouts/tpa-search/tpa-search.vue b/src/layouts/tpa-search/tpa-search.vue
index 0cf3e9fc..043c44b4 100644
--- a/src/layouts/tpa-search/tpa-search.vue
+++ b/src/layouts/tpa-search/tpa-search.vue
@@ -286,16 +286,16 @@ export default {
             if (provider) {
                 useMainStore().updateServiceLocation({
                     provider: {
-                        providerNumber: provider.providerNumber,
+                        providerNumber: provider?.providerNumber,
                         address: {
-                            streetAddress: provider.address.streetAddress,
-                            city: provider.address.city,
-                            state: provider.address.state,
-                            zipCode: provider.address.zipCode,
-                            zipCodeCtu: provider.address.zipCodeCtu
+                            streetAddress: provider.address?.streetAddress,
+                            city: provider.address?.city,
+                            state: provider.address?.state,
+                            zipCode: provider.address?.zipCode,
+                            zipCodeCtu: provider.address?.zipCodeCtu
                         },
-                        companyName: provider.companyName,
-                        phoneNumber: provider.phoneNumber
+                        companyName: provider?.companyName,
+                        phoneNumber: provider?.phoneNumber
                     }
                 });
             }
@@ -391,7 +391,6 @@ export default {
         toTitleCase
     }
 };
-
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/store/index.js b/src/store/index.js
index a019efb0..65c08ac9 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -116,8 +116,8 @@ const getDefaultState = () => ({
                     zipCode: null,
                     zipCodeCtu: null
                 },
-                companyName: null, // TODO set
-                phoneNumber: null // TODO set
+                companyName: null,
+                phoneNumber: null
             }
         },
         lineItems: {