diff --git a/vendor/magento/module-checkout/i18n/en_US.csv b/vendor/magento/module-checkout/i18n/en_US.csv
index ca118f21f24..e78b0f5c6ad 100644
--- a/vendor/magento/module-checkout/i18n/en_US.csv
+++ b/vendor/magento/module-checkout/i18n/en_US.csv
@@ -176,6 +176,7 @@ Summary,Summary
 "We'll send your order confirmation here.","We'll send your order confirmation here."
 Payment,Payment
 "Not yet calculated","Not yet calculated"
+"Selected shipping method is not available. Please select another shipping method for this order.","Selected shipping method is not available. Please select another shipping method for this order."
 "The order was not successful!","The order was not successful!"
 "Thank you for your purchase!","Thank you for your purchase!"
 "Password", "Password"
diff --git a/vendor/magento/module-checkout/view/frontend/layout/checkout_index_index.xml b/vendor/magento/module-checkout/view/frontend/layout/checkout_index_index.xml
index e854863a1da..1bb3eb2130c 100644
--- a/vendor/magento/module-checkout/view/frontend/layout/checkout_index_index.xml
+++ b/vendor/magento/module-checkout/view/frontend/layout/checkout_index_index.xml
@@ -372,7 +372,7 @@
                                                                 <item name="component" xsi:type="string">Magento_Checkout/js/view/summary/shipping</item>
                                                                 <item name="config" xsi:type="array">
                                                                     <item name="title" xsi:type="string" translate="true">Shipping</item>
-                                                                    <item name="notCalculatedMessage" xsi:type="string" translate="true">Not yet calculated</item>
+                                                                    <item name="notCalculatedMessage" xsi:type="string" translate="true">Selected shipping method is not available. Please select another shipping method for this order.</item>
                                                                 </item>
                                                             </item>
                                                             <item name="grand-total" xsi:type="array">
diff --git a/vendor/magento/theme-frontend-blank/Magento_Checkout/web/css/source/module/checkout/_order-summary.less b/vendor/magento/theme-frontend-blank/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
index 3394e8a4b50..41eca2db2fc 100644
--- a/vendor/magento/theme-frontend-blank/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
+++ b/vendor/magento/theme-frontend-blank/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
@@ -70,6 +70,7 @@
 
         .not-calculated {
             font-style: italic;
+            white-space: normal;
         }
 
         //
@@ -82,15 +83,7 @@
                 border-bottom: @border-width__base solid @border-color__base;
                 .lib-css(padding, @indent__s @indent__xl @indent__s 0);
                 cursor: pointer;
-                .lib-icon-font(
-                @icon-down,
-                @_icon-font-size: 30px,
-                @_icon-font-line-height: 12px,
-                @_icon-font-text-hide: true,
-                @_icon-font-margin: 3px 0 0,
-                @_icon-font-position: after,
-                @_icon-font-display: block
-                );
+                .lib-icon-font(@icon-down, @_icon-font-size: 30px, @_icon-font-line-height: 12px, @_icon-font-text-hide: true, @_icon-font-margin: 3px 0 0, @_icon-font-position: after, @_icon-font-display: block);
                 margin-bottom: 0;
                 position: relative;
 
@@ -109,10 +102,7 @@
 
             &.active {
                 > .title {
-                    .lib-icon-font-symbol(
-                    @_icon-font-content: @icon-up,
-                    @_icon-font-position: after
-                    );
+                    .lib-icon-font-symbol(@_icon-font-content: @icon-up, @_icon-font-position: after);
                 }
             }
 
diff --git a/vendor/magento/theme-frontend-luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less b/vendor/magento/theme-frontend-luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
index 920e68994c6..6ae6a23b9b0 100644
--- a/vendor/magento/theme-frontend-luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
+++ b/vendor/magento/theme-frontend-luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
@@ -70,6 +70,7 @@
 
         .not-calculated {
             font-style: italic;
+            white-space: normal;
         }
 
         //
@@ -82,15 +83,7 @@
                 border-bottom: @border-width__base solid @border-color__base;
                 .lib-css(padding, @indent__s @indent__xl @indent__s 0);
                 cursor: pointer;
-                .lib-icon-font(
-                @icon-down,
-                @_icon-font-size: 12px,
-                @_icon-font-line-height: 12px,
-                @_icon-font-text-hide: true,
-                @_icon-font-margin: 3px 0 0,
-                @_icon-font-position: after,
-                @_icon-font-display: block
-                );
+                .lib-icon-font(@icon-down, @_icon-font-size: 12px, @_icon-font-line-height: 12px, @_icon-font-text-hide: true, @_icon-font-margin: 3px 0 0, @_icon-font-position: after, @_icon-font-display: block);
                 margin-bottom: 0;
                 position: relative;
 
@@ -109,10 +102,7 @@
 
             &.active {
                 > .title {
-                    .lib-icon-font-symbol(
-                    @_icon-font-content: @icon-up,
-                    @_icon-font-position: after
-                    );
+                    .lib-icon-font-symbol(@_icon-font-content: @icon-up, @_icon-font-position: after);
                 }
             }