diff --git a/frontend-prep/src/pages/User/OrderDetails.tsx b/frontend-prep/src/pages/User/OrderDetails.tsx
index 27bcaaa3..fd59b226 100644
--- a/frontend-prep/src/pages/User/OrderDetails.tsx
+++ b/frontend-prep/src/pages/User/OrderDetails.tsx
@@ -324,7 +324,7 @@ function OrderDetails() {
                 console.log("✅ [ORDER DETAILS] Données mappées:", orderData);
                 setOrder(orderData);
 
-                if (apiData.command_info?.command_status === "approved" && apiData.command_info?.livreur_assign) {
+                if (apiData.command_info?.command_status === "approved") {
                     const r = await getOrderRatingStatus(id);
                     if (r.rated) setRatingDone({ rating: r.rating!, comment: r.comment ?? "" });
                 }
@@ -470,7 +470,7 @@ function OrderDetails() {
                                 </div>
                             )}
 
-                            {order.status === "approved" && order.livreur_assign && (
+                            {order.status === "approved" && (
                                 ratingDone ? (
                                     <div className="rating-done-row">
                                         <Star size={14} className="rating-star-filled" />
@@ -481,7 +481,7 @@ function OrderDetails() {
                                 ) : (
                                     <button className="rating-btn" onClick={() => setRatingModal(true)}>
                                         <Star size={14} />
-                                        Noter le livreur
+                                        Noter la livraison
                                     </button>
                                 )
                             )}
@@ -803,8 +803,10 @@ function OrderDetails() {
                 {ratingModal && (
                     <div className="rating-modal-overlay" onClick={() => setRatingModal(false)}>
                         <div className="rating-modal-sheet" onClick={(e) => e.stopPropagation()}>
-                            <h2 className="rating-modal-title">Noter le livreur</h2>
-                            <p className="rating-modal-subtitle">{order.livreur_assign}</p>
+                            <h2 className="rating-modal-title">Noter la livraison</h2>
+                            {order.livreur_assign && (
+                                <p className="rating-modal-subtitle">{order.livreur_assign}</p>
+                            )}
                             <div className="rating-stars-row">
                                 {[1, 2, 3, 4, 5].map((star) => (
                                     <button key={star} className="rating-star-btn" onClick={() => setSelectedStars(star)}>