diff --git a/app/owner/properties/page.js b/app/owner/properties/page.js
index eb34b16..e9594f3 100644
--- a/app/owner/properties/page.js
+++ b/app/owner/properties/page.js
@@ -254,20 +254,28 @@ const PropertyViewModal = ({ isOpen, onClose, property }) => {
             </p>
           </div>
 
-          {property.services && Object.keys(property.services).length > 0 && (
+          {property.services && (Array.isArray(property.services) ? property.services.length > 0 : Object.keys(property.services).length > 0) && (
             <div className="bg-gray-50 p-4 rounded-xl mb-6">
               <h4 className="font-bold text-gray-700 mb-3">الخدمات المتوفرة</h4>
               <div className="flex flex-wrap gap-2">
-                {Object.entries(property.services).map(([key, value]) => {
-                  if (!value) return null;
-                  const detail = typeof value === 'object' && value.detail ? value.detail : null;
-                  return (
-                    <span key={key} className="inline-flex items-center gap-1 px-3 py-1 bg-green-100 text-green-800 rounded-full text-sm">
-                      {serviceLabels[key] || key}
-                      {detail && <span className="text-green-400">· {detail}</span>}
+                {Array.isArray(property.services) ? (
+                  property.services.map((svc, i) => (
+                    <span key={i} className="inline-flex items-center gap-1 px-3 py-1 bg-green-100 text-green-800 rounded-full text-sm">
+                      {serviceLabels[svc] || svc}
                     </span>
-                  );
-                })}
+                  ))
+                ) : (
+                  Object.entries(property.services).map(([key, value]) => {
+                    if (!value) return null;
+                    const detail = typeof value === 'object' && value.detail ? value.detail : null;
+                    return (
+                      <span key={key} className="inline-flex items-center gap-1 px-3 py-1 bg-green-100 text-green-800 rounded-full text-sm">
+                        {serviceLabels[key] || key}
+                        {detail && <span className="text-green-400">· {detail}</span>}
+                      </span>
+                    );
+                  })
+                )}
               </div>
             </div>
           )}
diff --git a/app/property/[id]/PropertyDetail.js b/app/property/[id]/PropertyDetail.js
index 84e6573..97ba66c 100644
--- a/app/property/[id]/PropertyDetail.js
+++ b/app/property/[id]/PropertyDetail.js
@@ -483,20 +483,28 @@ export default function PropertyDetailsPage() {
               </div>
 
               {/* Services with detail text */}
-              {Object.keys(property.services).length > 0 && (
+              {property.services && (Array.isArray(property.services) ? property.services.length > 0 : Object.keys(property.services).length > 0) && (
                 <div className="mb-4">
                   <h3 className="font-bold text-gray-900 mb-2 text-sm">الخدمات</h3>
                   <div className="flex flex-wrap gap-1.5">
-                    {Object.entries(property.services).map(([key, val]) => {
-                      if (!val) return null;
-                      const detail = typeof val === 'object' && val.detail ? val.detail : null;
-                      return (
-                        <span key={key} className="px-3 py-1 bg-green-50 text-green-700 rounded-full text-sm border border-green-200 flex items-center gap-1">
-                          {serviceLabels[key] || key}
-                          {detail && <span className="text-green-400">· {detail}</span>}
+                    {Array.isArray(property.services) ? (
+                      property.services.map((svc, i) => (
+                        <span key={i} className="px-3 py-1 bg-green-50 text-green-700 rounded-full text-sm border border-green-200 flex items-center gap-1">
+                          {serviceLabels[svc] || svc}
                         </span>
-                      );
-                    })}
+                      ))
+                    ) : (
+                      Object.entries(property.services).map(([key, val]) => {
+                        if (!val) return null;
+                        const detail = typeof val === 'object' && val.detail ? val.detail : null;
+                        return (
+                          <span key={key} className="px-3 py-1 bg-green-50 text-green-700 rounded-full text-sm border border-green-200 flex items-center gap-1">
+                            {serviceLabels[key] || key}
+                            {detail && <span className="text-green-400">· {detail}</span>}
+                          </span>
+                        );
+                      })
+                    )}
                   </div>
                 </div>
               )}