diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/DeliveryDateControllerAttributeTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/DeliveryDateControllerAttributeTests.cs
index a2133a985..ccbd15518 100644
--- a/src/Tests/Grand.Web.Admin.Tests/Controllers/DeliveryDateControllerAttributeTests.cs
+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/DeliveryDateControllerAttributeTests.cs
@@ -34,7 +34,7 @@ public void Controller_HasRouteTemplate_PreservingShippingSegment()
     {
         var route = ControllerType.GetCustomAttribute<RouteAttribute>();
         Assert.IsNotNull(route);
-        Assert.AreEqual("[area]/Shipping/[action]", route.Template);
+        Assert.AreEqual("[area]/Shipping/[action]/{id?}", route.Template);
     }
 
     [TestMethod]
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/PickupPointControllerAttributeTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/PickupPointControllerAttributeTests.cs
index 7121c0bde..8d2bdf8e8 100644
--- a/src/Tests/Grand.Web.Admin.Tests/Controllers/PickupPointControllerAttributeTests.cs
+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/PickupPointControllerAttributeTests.cs
@@ -34,7 +34,7 @@ public void Controller_HasRouteTemplate_PreservingShippingSegment()
     {
         var route = ControllerType.GetCustomAttribute<RouteAttribute>();
         Assert.IsNotNull(route);
-        Assert.AreEqual("[area]/Shipping/[action]", route.Template);
+        Assert.AreEqual("[area]/Shipping/[action]/{id?}", route.Template);
     }
 
     [TestMethod]
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/ShippingMethodControllerAttributeTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/ShippingMethodControllerAttributeTests.cs
index deab8ff21..d5e0793b1 100644
--- a/src/Tests/Grand.Web.Admin.Tests/Controllers/ShippingMethodControllerAttributeTests.cs
+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/ShippingMethodControllerAttributeTests.cs
@@ -34,7 +34,7 @@ public void Controller_HasRouteTemplate_PreservingShippingSegment()
     {
         var route = ControllerType.GetCustomAttribute<RouteAttribute>();
         Assert.IsNotNull(route);
-        Assert.AreEqual("[area]/Shipping/[action]", route.Template);
+        Assert.AreEqual("[area]/Shipping/[action]/{id?}", route.Template);
     }
 
     [TestMethod]
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/WarehouseControllerAttributeTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/WarehouseControllerAttributeTests.cs
index 4a71c9c32..e87db2138 100644
--- a/src/Tests/Grand.Web.Admin.Tests/Controllers/WarehouseControllerAttributeTests.cs
+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/WarehouseControllerAttributeTests.cs
@@ -34,7 +34,7 @@ public void Controller_HasRouteTemplate_PreservingShippingSegment()
     {
         var route = ControllerType.GetCustomAttribute<RouteAttribute>();
         Assert.IsNotNull(route);
-        Assert.AreEqual("[area]/Shipping/[action]", route.Template);
+        Assert.AreEqual("[area]/Shipping/[action]/{id?}", route.Template);
     }
 
     [TestMethod]
diff --git a/src/Tests/Grand.Web.Store.Tests/Controllers/DeliveryDateControllerAttributeTests.cs b/src/Tests/Grand.Web.Store.Tests/Controllers/DeliveryDateControllerAttributeTests.cs
index b8bfb32a0..a14d4e539 100644
--- a/src/Tests/Grand.Web.Store.Tests/Controllers/DeliveryDateControllerAttributeTests.cs
+++ b/src/Tests/Grand.Web.Store.Tests/Controllers/DeliveryDateControllerAttributeTests.cs
@@ -27,7 +27,7 @@ public void Controller_HasRouteTemplate_PreservingShippingSegment()
     {
         var route = ControllerType.GetCustomAttribute<RouteAttribute>();
         Assert.IsNotNull(route);
-        Assert.AreEqual("[area]/Shipping/[action]", route.Template);
+        Assert.AreEqual("[area]/Shipping/[action]/{id?}", route.Template);
     }
 
     [TestMethod]
diff --git a/src/Tests/Grand.Web.Store.Tests/Controllers/PickupPointControllerAttributeTests.cs b/src/Tests/Grand.Web.Store.Tests/Controllers/PickupPointControllerAttributeTests.cs
index e6c6d8441..5f1724f61 100644
--- a/src/Tests/Grand.Web.Store.Tests/Controllers/PickupPointControllerAttributeTests.cs
+++ b/src/Tests/Grand.Web.Store.Tests/Controllers/PickupPointControllerAttributeTests.cs
@@ -27,7 +27,7 @@ public void Controller_HasRouteTemplate_PreservingShippingSegment()
     {
         var route = ControllerType.GetCustomAttribute<RouteAttribute>();
         Assert.IsNotNull(route);
-        Assert.AreEqual("[area]/Shipping/[action]", route.Template);
+        Assert.AreEqual("[area]/Shipping/[action]/{id?}", route.Template);
     }
 
     [TestMethod]
diff --git a/src/Tests/Grand.Web.Store.Tests/Controllers/ShippingMethodControllerAttributeTests.cs b/src/Tests/Grand.Web.Store.Tests/Controllers/ShippingMethodControllerAttributeTests.cs
index a088e3d25..0cfa6e903 100644
--- a/src/Tests/Grand.Web.Store.Tests/Controllers/ShippingMethodControllerAttributeTests.cs
+++ b/src/Tests/Grand.Web.Store.Tests/Controllers/ShippingMethodControllerAttributeTests.cs
@@ -27,7 +27,7 @@ public void Controller_HasRouteTemplate_PreservingShippingSegment()
     {
         var route = ControllerType.GetCustomAttribute<RouteAttribute>();
         Assert.IsNotNull(route);
-        Assert.AreEqual("[area]/Shipping/[action]", route.Template);
+        Assert.AreEqual("[area]/Shipping/[action]/{id?}", route.Template);
     }
 
     [TestMethod]
diff --git a/src/Tests/Grand.Web.Store.Tests/Controllers/WarehouseControllerAttributeTests.cs b/src/Tests/Grand.Web.Store.Tests/Controllers/WarehouseControllerAttributeTests.cs
index 42860f734..224cd661c 100644
--- a/src/Tests/Grand.Web.Store.Tests/Controllers/WarehouseControllerAttributeTests.cs
+++ b/src/Tests/Grand.Web.Store.Tests/Controllers/WarehouseControllerAttributeTests.cs
@@ -27,7 +27,7 @@ public void Controller_HasRouteTemplate_PreservingShippingSegment()
     {
         var route = ControllerType.GetCustomAttribute<RouteAttribute>();
         Assert.IsNotNull(route);
-        Assert.AreEqual("[area]/Shipping/[action]", route.Template);
+        Assert.AreEqual("[area]/Shipping/[action]/{id?}", route.Template);
     }
 
     [TestMethod]
diff --git a/src/Web/Grand.Web.Admin/Controllers/DeliveryDateController.cs b/src/Web/Grand.Web.Admin/Controllers/DeliveryDateController.cs
index 64e61674b..c827d14d0 100644
--- a/src/Web/Grand.Web.Admin/Controllers/DeliveryDateController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/DeliveryDateController.cs
@@ -18,7 +18,7 @@ namespace Grand.Web.Admin.Controllers;
 [AutoValidateAntiforgeryToken]
 [AuthorizeMenu]
 [PermissionAuthorize(PermissionSystemName.ShippingSettings)]
-[Route("[area]/Shipping/[action]")]
+[Route("[area]/Shipping/[action]/{id?}")]
 public class DeliveryDateController(
     IDeliveryDateService deliveryDateService,
     ILanguageService languageService,
diff --git a/src/Web/Grand.Web.Admin/Controllers/PickupPointController.cs b/src/Web/Grand.Web.Admin/Controllers/PickupPointController.cs
index adf153b11..158985dc8 100644
--- a/src/Web/Grand.Web.Admin/Controllers/PickupPointController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/PickupPointController.cs
@@ -19,7 +19,7 @@ namespace Grand.Web.Admin.Controllers;
 [AutoValidateAntiforgeryToken]
 [AuthorizeMenu]
 [PermissionAuthorize(PermissionSystemName.ShippingSettings)]
-[Route("[area]/Shipping/[action]")]
+[Route("[area]/Shipping/[action]/{id?}")]
 public class PickupPointController(
     IPickupPointService pickupPointService,
     IWarehouseService warehouseService,
diff --git a/src/Web/Grand.Web.Admin/Controllers/ShippingMethodController.cs b/src/Web/Grand.Web.Admin/Controllers/ShippingMethodController.cs
index 0949920f7..fd7b11e78 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ShippingMethodController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ShippingMethodController.cs
@@ -18,7 +18,7 @@ namespace Grand.Web.Admin.Controllers;
 [AutoValidateAntiforgeryToken]
 [AuthorizeMenu]
 [PermissionAuthorize(PermissionSystemName.ShippingSettings)]
-[Route("[area]/Shipping/[action]")]
+[Route("[area]/Shipping/[action]/{id?}")]
 public class ShippingMethodController(
     IShippingMethodService shippingMethodService,
     ILanguageService languageService,
diff --git a/src/Web/Grand.Web.Admin/Controllers/WarehouseController.cs b/src/Web/Grand.Web.Admin/Controllers/WarehouseController.cs
index fa28442b7..918f979a5 100644
--- a/src/Web/Grand.Web.Admin/Controllers/WarehouseController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/WarehouseController.cs
@@ -19,7 +19,7 @@ namespace Grand.Web.Admin.Controllers;
 [AutoValidateAntiforgeryToken]
 [AuthorizeMenu]
 [PermissionAuthorize(PermissionSystemName.ShippingSettings)]
-[Route("[area]/Shipping/[action]")]
+[Route("[area]/Shipping/[action]/{id?}")]
 public class WarehouseController(
     IWarehouseService warehouseService,
     ICountryService countryService,
diff --git a/src/Web/Grand.Web.Store/Controllers/DeliveryDateController.cs b/src/Web/Grand.Web.Store/Controllers/DeliveryDateController.cs
index 3dab6066f..7afba3b8f 100644
--- a/src/Web/Grand.Web.Store/Controllers/DeliveryDateController.cs
+++ b/src/Web/Grand.Web.Store/Controllers/DeliveryDateController.cs
@@ -17,7 +17,7 @@ namespace Grand.Web.Store.Controllers;
 [AutoValidateAntiforgeryToken]
 [AuthorizeMenu]
 [PermissionAuthorize(PermissionSystemName.ShippingSettings)]
-[Route("[area]/Shipping/[action]")]
+[Route("[area]/Shipping/[action]/{id?}")]
 public class DeliveryDateController(
     IDeliveryDateService deliveryDateService,
     ILanguageService languageService,
diff --git a/src/Web/Grand.Web.Store/Controllers/PickupPointController.cs b/src/Web/Grand.Web.Store/Controllers/PickupPointController.cs
index 970894cea..c1cc59392 100644
--- a/src/Web/Grand.Web.Store/Controllers/PickupPointController.cs
+++ b/src/Web/Grand.Web.Store/Controllers/PickupPointController.cs
@@ -18,7 +18,7 @@ namespace Grand.Web.Store.Controllers;
 [AutoValidateAntiforgeryToken]
 [AuthorizeMenu]
 [PermissionAuthorize(PermissionSystemName.ShippingSettings)]
-[Route("[area]/Shipping/[action]")]
+[Route("[area]/Shipping/[action]/{id?}")]
 public class PickupPointController(
     IPickupPointService pickupPointService,
     IWarehouseService warehouseService,
diff --git a/src/Web/Grand.Web.Store/Controllers/ShippingMethodController.cs b/src/Web/Grand.Web.Store/Controllers/ShippingMethodController.cs
index 7f42d3631..3a0f92e73 100644
--- a/src/Web/Grand.Web.Store/Controllers/ShippingMethodController.cs
+++ b/src/Web/Grand.Web.Store/Controllers/ShippingMethodController.cs
@@ -17,7 +17,7 @@ namespace Grand.Web.Store.Controllers;
 [AutoValidateAntiforgeryToken]
 [AuthorizeMenu]
 [PermissionAuthorize(PermissionSystemName.ShippingSettings)]
-[Route("[area]/Shipping/[action]")]
+[Route("[area]/Shipping/[action]/{id?}")]
 public class ShippingMethodController(
     IShippingMethodService shippingMethodService,
     ILanguageService languageService,
diff --git a/src/Web/Grand.Web.Store/Controllers/WarehouseController.cs b/src/Web/Grand.Web.Store/Controllers/WarehouseController.cs
index d733e56fa..995dfff9c 100644
--- a/src/Web/Grand.Web.Store/Controllers/WarehouseController.cs
+++ b/src/Web/Grand.Web.Store/Controllers/WarehouseController.cs
@@ -18,7 +18,7 @@ namespace Grand.Web.Store.Controllers;
 [AutoValidateAntiforgeryToken]
 [AuthorizeMenu]
 [PermissionAuthorize(PermissionSystemName.ShippingSettings)]
-[Route("[area]/Shipping/[action]")]
+[Route("[area]/Shipping/[action]/{id?}")]
 public class WarehouseController(
     IWarehouseService warehouseService,
     ICountryService countryService,