diff --git a/src/features/profile/ui/History.tsx b/src/features/profile/ui/History.tsx
index 1a72b7e..b4acb8e 100644
--- a/src/features/profile/ui/History.tsx
+++ b/src/features/profile/ui/History.tsx
@@ -83,7 +83,7 @@ const HistoryTabs = () => {
 
       {/* Orders List */}
       <div className="space-y-6">
-        {data.map((order: OrderList) => {
+        {data?.map((order: OrderList) => {
           const totalPrice = order.items.reduce(
             (sum, item) => sum + Number(item.price) * item.quantity,
             0,
@@ -144,7 +144,7 @@ const HistoryTabs = () => {
 
                 {/* Products */}
                 <div className="p-4 space-y-3">
-                  {order.items.map((item, index) => {
+                  {order?.items?.map((item, index) => {
                     const product = item.product;
 
                     // Get product image
@@ -212,8 +212,7 @@ const HistoryTabs = () => {
                               {t('Miqdor')}
                             </span>
                             <span className="text-base font-bold text-gray-900">
-                              {item.quantity}{' '}
-                              {product.meansurement || t('dona')}
+                              {item?.quantity}
                             </span>
                           </div>
                           <div className="flex flex-col items-end">