diff --git a/modules/checkout/templates/commerce-checkout-completion-message.html.twig b/modules/checkout/templates/commerce-checkout-completion-message.html.twig
index 5c8727f8bc..a22dfaa734 100644
--- a/modules/checkout/templates/commerce-checkout-completion-message.html.twig
+++ b/modules/checkout/templates/commerce-checkout-completion-message.html.twig
@@ -11,8 +11,13 @@
  */
 #}
 <div class="checkout-complete">
-  {{ 'Your order number is @number.'|t({'@number': order_entity.getOrderNumber}) }} <br>
-  {{ 'You can view your order on your account page when logged in.'|t }} <br>
+  {% if logged_in %}
+    {% set order_url = path('entity.commerce_order.user_view', {'user': order_entity.getCustomerId, 'commerce_order': order_entity.getOrderNumber}) %}
+    {{ 'Your order number is <a href="@order_url">@number</a>.'|t({'@order_url': order_url,'@number': order_entity.getOrderNumber}) }} <br>
+  {% else %}
+    {{ 'Your order number is @number.'|t({'@number': order_entity.getOrderNumber}) }} <br>
+    {{ 'You can view your order on your account page when logged in.'|t }} <br>
+  {% endif %}
 
   {% if payment_instructions %}
     <div class="checkout-complete__payment-instructions">