diff --git a/src/site/components/phone-number.drupal.liquid b/src/site/components/phone-number.drupal.liquid
index 3ea02d41fb..f7fccb6bae 100644
--- a/src/site/components/phone-number.drupal.liquid
+++ b/src/site/components/phone-number.drupal.liquid
@@ -1,8 +1,19 @@
-<h{{ phoneHeaderLevel }}>{{ phoneLabel | default: 'Phone' }}</h{{ phoneHeaderLevel }}>
-<div>
-  <va-telephone
-    contact="{{ phoneNumber | removeDashes }}"
-    extension="{{ phoneExtension | default: '' }}"
-    message-aria-describedby="{{ phoneLabel | default: 'Phone' }}"
-  />
-</div>
+{% if phoneNumber %}
+  {% if phoneExtension %}
+    {% assign partialPhoneNumber = phoneNumber %}
+    {% assign partialPhoneExtension = phoneExtension %}
+  {% else %}
+    {% assign separatedPhoneNumber = phoneNumber | separatePhoneNumberExtension %}
+    {% assign partialPhoneNumber = separatedPhoneNumber.phoneNumber %}
+    {% assign partialPhoneExtension = separatedPhoneNumber.extension %}
+  {% endif %}
+
+  <h{{ phoneHeaderLevel }}>{{ phoneLabel | default: 'Phone' }}</h{{ phoneHeaderLevel }}>
+  <div>
+    <va-telephone
+      contact="{{ partialPhoneNumber | removeDashes }}"
+      extension="{{ partialPhoneExtension | default: '' }}"
+      message-aria-describedby="{{ phoneLabel | default: 'Phone' }}"
+    />
+  </div>
+{% endif %}
diff --git a/src/site/includes/vba_facilities/service_location.liquid b/src/site/includes/vba_facilities/service_location.liquid
index d925720c55..0391953f8d 100644
--- a/src/site/includes/vba_facilities/service_location.liquid
+++ b/src/site/includes/vba_facilities/service_location.liquid
@@ -25,7 +25,12 @@
         Main Phone
       </h5>
 
-      <va-telephone contact="{{ facilityPhone }}" message-aria-describedby="Main Phone" />
+      {% assign serviceLocationMainPhone = facilityPhone | separatePhoneNumberExtension %}
+      <va-telephone
+        contact="{{ serviceLocationMainPhone.phoneNumber }}"
+        extension="{{ serviceLocationMainPhone.extension }}"
+        message-aria-describedby="Main Phone"
+      />
     </div>
   {% elsif location.entity.fieldPhone %}
     {% for phoneObj in location.entity.fieldPhone %}
@@ -136,4 +141,4 @@
       </p>
     </div>
   {% endif %}
-</div>
\ No newline at end of file
+</div>
diff --git a/src/site/layouts/vba_facility.drupal.liquid b/src/site/layouts/vba_facility.drupal.liquid
index 3739641a2c..583a4af173 100644
--- a/src/site/layouts/vba_facility.drupal.liquid
+++ b/src/site/layouts/vba_facility.drupal.liquid
@@ -114,7 +114,13 @@
                         <div class="vads-u-margin-bottom--1">
                           <p class="vads-u-margin-top--0">
                             <strong>Main phone:</strong>
-                            <va-telephone contact="{{fieldPhoneNumber}}" />
+
+                            {% assign vbaFacilityMainPhone = fieldPhoneNumber | separatePhoneNumberExtension %}
+                            <va-telephone
+                              contact="{{ vbaFacilityMainPhone.phoneNumber }}"
+                              extension="{{ vbaFacilityMainPhone.extension }}"
+                              message-aria-describedby="Main Phone"
+                            />
                           </p>
                         </div>
                       {% endif %}
@@ -249,7 +255,7 @@
                     fieldTwitter = fieldUpdatesVba.links.twitter
                     fieldInstagram = fieldUpdatesVba.links.instagram
                     fieldFlickr = fieldUpdatesVba.links.flickr
-                    
+
             %}
           {% endif %}
           <h2 class="vads-u-line-height--1 vads-u-margin-bottom--3">