diff --git a/CHANGELOG.md b/CHANGELOG.md
index 533bfa184..9d00b584a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Next release
 
+## v6.3.47 2025 Avril 1
+
+- Fix a bug: unable to hide machine/space deleted in price of plan
+
 ## v6.3.46 2025 March 31
 
 - Fix a bug: unable to cancel stripe subscription canceled
diff --git a/app/frontend/src/javascript/components/plans/plan-pricing-form.tsx b/app/frontend/src/javascript/components/plans/plan-pricing-form.tsx
index 247b9b60b..b9d2dab39 100644
--- a/app/frontend/src/javascript/components/plans/plan-pricing-form.tsx
+++ b/app/frontend/src/javascript/components/plans/plan-pricing-form.tsx
@@ -71,7 +71,7 @@ export const PlanPricingForm = <TContext extends object>({ register, control, fo
   const renderPriceElement = (price: Price, index: number) => {
     const item: Space | Machine = (price.priceable_type === 'Machine' && machines?.find(m => m.id === price.priceable_id)) ||
                                   (price.priceable_type === 'Space' && spaces?.find(s => s.id === price.priceable_id));
-    if (!item?.disabled) {
+    if (item && !item.disabled) {
       return (
         <div key={price.id}>
           <FormInput register={register}
diff --git a/package.json b/package.json
index de816db47..d1d285770 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fab-manager",
-  "version": "6.3.46",
+  "version": "6.3.47",
   "description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.",
   "keywords": [
     "fablab",