diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
index 70b716b..1576f4a 100755
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@@ -30,7 +30,7 @@ return [
             ],
         ],
     ],
-    '^/warehouse/stock/view(\?.*)?$' => [
+    '^/warehouse/stock/view(\?.*$|$)' => [
         [
             'dest'       => '\Modules\WarehouseManagement\Controller\BackendController:viewStock',
             'verb'       => RouteVerb::GET,
@@ -42,7 +42,7 @@ return [
             ],
         ],
     ],
-    '^/warehouse/stock/create(\?.*)?$' => [
+    '^/warehouse/stock/create(\?.*$|$)' => [
         [
             'dest'       => '\Modules\WarehouseManagement\Controller\BackendController:viewStockCreate',
             'verb'       => RouteVerb::GET,
@@ -66,7 +66,7 @@ return [
             ],
         ],
     ],
-    '^/warehouse/stock/type/view(\?.*)?$' => [
+    '^/warehouse/stock/type/view(\?.*$|$)' => [
         [
             'dest'       => '\Modules\WarehouseManagement\Controller\BackendController:viewStockType',
             'verb'       => RouteVerb::GET,
@@ -78,7 +78,7 @@ return [
             ],
         ],
     ],
-    '^/warehouse/stock/type/create(\?.*)?$' => [
+    '^/warehouse/stock/type/create(\?.*$|$)' => [
         [
             'dest'       => '\Modules\WarehouseManagement\Controller\BackendController:viewStockTypeCreate',
             'verb'       => RouteVerb::GET,
@@ -102,7 +102,7 @@ return [
             ],
         ],
     ],
-    '^/warehouse/stock/location/view(\?.*)?$' => [
+    '^/warehouse/stock/location/view(\?.*$|$)' => [
         [
             'dest'       => '\Modules\WarehouseManagement\Controller\BackendController:viewStockLocation',
             'verb'       => RouteVerb::GET,
@@ -114,7 +114,7 @@ return [
             ],
         ],
     ],
-    '^/warehouse/stock/location/create(\?.*)?$' => [
+    '^/warehouse/stock/location/create(\?.*$|$)' => [
         [
             'dest'       => '\Modules\WarehouseManagement\Controller\BackendController:viewStockLocationCreate',
             'verb'       => RouteVerb::GET,
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index ecf24f0..db114a6 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -21,6 +21,7 @@ use Modules\Billing\Models\BillTransferType;
 use Modules\ClientManagement\Models\NullClient;
 use Modules\ItemManagement\Models\StockIdentifierType;
 use Modules\SupplierManagement\Models\NullSupplier;
+use Modules\WarehouseManagement\Models\NullStock;
 use Modules\WarehouseManagement\Models\NullStockType;
 use Modules\WarehouseManagement\Models\Stock;
 use Modules\WarehouseManagement\Models\StockDistribution;
@@ -185,7 +186,7 @@ final class ApiController extends Controller
     {
         $location        = new StockLocation();
         $location->name  = $request->getDataString('name') ?? '';
-        $location->stock = $request->getDataInt('stock') ?? 1;
+        $location->stock = new NullStock($request->getDataInt('stock') ?? 1);
 
         $location->type = $request->hasData('type') ? new NullStockType((int) $request->getDataInt('type')) : null;
 
diff --git a/Models/StockLocation.php b/Models/StockLocation.php
index 2af015c..1a337bd 100755
--- a/Models/StockLocation.php
+++ b/Models/StockLocation.php
@@ -34,7 +34,7 @@ class StockLocation
 
     public string $name = '';
 
-    public int | Stock $stock = 0;
+    public Stock $stock;
 
     public ?StockType $type = null;
 
@@ -56,5 +56,6 @@ class StockLocation
     public function __construct(string $name = '')
     {
         $this->name = $name;
+        $this->stock = new NullStock();
     }
 }
diff --git a/Theme/Backend/stock-location-view.tpl.php b/Theme/Backend/stock-location-view.tpl.php
index b5310a8..dce2f11 100644
--- a/Theme/Backend/stock-location-view.tpl.php
+++ b/Theme/Backend/stock-location-view.tpl.php
@@ -34,7 +34,7 @@ echo $this->data['nav']->render();
 
                     <div class="form-group">
                         <label for="iLocationStock"><?= $this->getHtml('Stock'); ?></label>
-                        <input type="text" id="iLocationStock" name="stock" value="<?= $location->stock; ?>"<?= $isNew ? ' required' : ' disabled'; ?>>
+                        <input type="text" id="iLocationStock" name="stock" value="<?= $location->stock->id; ?>"<?= $isNew ? ' required' : ' disabled'; ?>>
                     </div>
 
                     <div class="form-group">