diff --git a/resources/views/cart/queries/fragments/cart.graphql b/resources/views/cart/queries/fragments/cart.graphql
index e73d349f8..c127cc159 100644
--- a/resources/views/cart/queries/fragments/cart.graphql
+++ b/resources/views/cart/queries/fragments/cart.graphql
@@ -99,6 +99,7 @@ fragment cart on Cart {
             carrier_code
             method_code
             method_title
+            error_message
             amount {
                 value
             }
diff --git a/resources/views/checkout/steps/shipping-method.blade.php b/resources/views/checkout/steps/shipping-method.blade.php
index e3a285a13..4da537bc9 100644
--- a/resources/views/checkout/steps/shipping-method.blade.php
+++ b/resources/views/checkout/steps/shipping-method.blade.php
@@ -20,9 +20,11 @@
         <label class="flex items-center p-5 border rounded relative bg-white" v-if="!cart.value.shipping_addresses?.[0]?.uid">
             <span>@lang('Please enter a shipping address first')</span>
         </label>
-        <label class="flex items-center gap-x-1.5 p-5 border rounded bg-white cursor-pointer text-sm text" v-for="(method, index) in cart.value.shipping_addresses?.[0]?.available_shipping_methods">
+        <label class="flex gap-x-1.5 p-5 border rounded bg-white text-sm text has-[[disabled]]:cursor-not-allowed" v-for="(method, index) in cart.value.shipping_addresses?.[0]?.available_shipping_methods">
             <template v-if="false"></template>
-                @stack('shipping_methods')
+
+            @stack('shipping_methods')
+
             <template v-else>
                 <x-rapidez::input.radio.base
                     name="shipping_method"
@@ -32,9 +34,20 @@
                     data-testid="shipping-method"
                     v-on:change="mutate"
                     required
+                    class="mr-1"
                 />
-                <span class="ml-1">@{{ method.method_title }}</span>
-                <span v-if="method.amount.value">- @{{ price(method.amount.value) }}</span>
+                <span class="flex flex-col">
+                    <span>
+                        <span v-if="method.method_title" class="font-medium">
+                            @{{ method.method_title }}
+                        </span>
+                        <span v-else class="font-medium">
+                            @{{ method.carrier_title }}
+                        </span>
+                        <span v-if="method.amount.value"> - @{{ price(method.amount.value) }}</span>
+                    </span>
+                    <span class="basis-full text-muted" v-if="method.error_message" v-text="method.error_message"></span>
+                </span>
             </template>
         </label>
     </fieldset>
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-2-Mobile-Chrome-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-2-Mobile-Chrome-linux.png
index 3cc31045a..91f0cc3e7 100644
--- a/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-2-Mobile-Chrome-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-2-Mobile-Chrome-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:35d0398bc564481bb24863bb049429d609159ce2532d70bf43654d12cd3f9ffb
-size 94262
+oid sha256:9d7358e49dfc46c2112cfb8857d89fc2c691e3691add3234b4cc517bf53ec91b
+size 94249
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-2-Mobile-Safari-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-2-Mobile-Safari-linux.png
index 0160e2014..58582aa28 100644
--- a/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-2-Mobile-Safari-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-2-Mobile-Safari-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cfdb378cb658a3de89c860b06ade8b59d381bdb069ed53085972f7ceca21dec8
-size 106279
+oid sha256:9f1cbbc2b2195737d1a5caadd020f8efddbb51828c3ccf02f666b54d9a186e79
+size 106295
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-2-chromium-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-2-chromium-linux.png
index a7cd06257..4b17b4dd6 100644
--- a/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-2-chromium-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-2-chromium-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2800ca220ff11569343a98c201f900f44a16251c92c3985fad7449b7f9dcdd9b
-size 89158
+oid sha256:69c06f53be090770ac8e3691ffa78bdab86bfbdb1e80e4a7410308927b7281a7
+size 89157
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-2-firefox-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-2-firefox-linux.png
index 5b9d9386a..100f477a9 100644
--- a/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-2-firefox-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-2-firefox-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:117db72bcee546e7bb91891bc1457b808239b591a59dcd645840ba40fcad5b14
-size 132445
+oid sha256:39d76454dde65c003fce6b237b4a420bdcc5b5b69a7dc33de3c3855442224014
+size 132520
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-2-webkit-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-2-webkit-linux.png
index 77de16476..91b7efe49 100644
--- a/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-2-webkit-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-2-webkit-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e815a6d25e513a5542d8b331c5ee6906aad6decf2e337b898f2e07ca77c3606c
-size 107022
+oid sha256:55b87e8c15aa60eea2fd5a2492bbaca59374916ee915d44eb8449c74573b691b
+size 107056