diff --git a/src/features/category/ui/Product.tsx b/src/features/category/ui/Product.tsx
index 9cc6f31..c99889d 100644
--- a/src/features/category/ui/Product.tsx
+++ b/src/features/category/ui/Product.tsx
@@ -7,22 +7,22 @@ import { GlobalPagination } from '@/shared/ui/global-pagination';
 import { Skeleton } from '@/shared/ui/skeleton';
 import { ProductCard } from '@/widgets/categories/ui/product-card';
 import { useQuery } from '@tanstack/react-query';
-import { ArrowLeft } from 'lucide-react';
+import { ArrowLeft, ShoppingBag } from 'lucide-react';
 import { useTranslations } from 'next-intl';
 import { useParams, useSearchParams } from 'next/navigation';
-import { useEffect, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 
 const PAGE_SIZE = 36;
 
 const Product = () => {
   const { subId } = useParams();
-
   const router = useRouter();
   const pathname = usePathname();
   const searchParams = useSearchParams();
-  const [page, setPage] = useState(1);
   const t = useTranslations();
 
+  const [page, setPage] = useState(1);
+
   useEffect(() => {
     const urlPage = Number(searchParams.get('page')) || 1;
     setPage(urlPage);
@@ -48,6 +48,10 @@ const Product = () => {
     enabled: !!subId,
   });
 
+  const activeProducts = useMemo(() => {
+    return product?.results?.filter((item) => item.state === 'A') ?? [];
+  }, [product]);
+
   const handleBack = () => {
     router.back();
   };
@@ -62,7 +66,7 @@ const Product = () => {
   };
 
   return (
-    <div className="custom-container p-4 mb-5 flex flex-col min-h-[calc(85vh)]">
+    <div className="custom-container p-4 mb-5 flex flex-col min-h-[85vh]">
       <div className="flex-1">
         {/* Header */}
         <div className="mb-6">
@@ -74,38 +78,50 @@ const Product = () => {
             <span>{t('Orqaga')}</span>
           </button>
 
-          <p className="text-gray-600 text-sm mt-1">
-            {product?.total} {t('ta mahsulot')}
+          <p className="text-gray-600 text-sm">
+            {product?.total ?? 0} {t('ta mahsulot')}
           </p>
         </div>
 
-        {/* Products grid */}
+        {/* Products */}
         <div className="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-5 xl:grid-cols-6 gap-3">
+          {/* Loading */}
           {isLoading &&
             Array.from({ length: 6 }).map((_, index) => (
-              <Card className="p-3 space-y-3 rounded-xl" key={index}>
+              <Card key={index} className="p-3 space-y-3 rounded-xl">
                 <Skeleton className="h-40 sm:h-48 md:h-56 w-full rounded-lg" />
                 <Skeleton className="h-4 w-3/4" />
                 <Skeleton className="h-4 w-1/2" />
                 <Skeleton className="h-10 w-full rounded-lg" />
               </Card>
             ))}
-          {product &&
-            !isLoading &&
-            product.results
-              .filter((product) => product.state === 'A')
-              .map((item) => (
-                <ProductCard key={item.id} product={item} error={isError} />
-              ))}
+
+          {/* Empty state */}
+          {!isLoading && activeProducts.length === 0 && (
+            <div className="col-span-full flex flex-col items-center justify-center py-24 text-gray-500">
+              <div className="text-5xl mb-4">
+                <ShoppingBag size={70} />
+              </div>
+              <p className="text-lg font-medium text-center">
+                {t("Hozirchali bu kategoriyada mahsulot yo'q")}
+              </p>
+            </div>
+          )}
+
+          {/* Products list */}
+          {!isLoading &&
+            activeProducts.map((item) => (
+              <ProductCard key={item.id} product={item} error={isError} />
+            ))}
         </div>
       </div>
 
-      {/* Pagination at the bottom */}
-      {product && (
-        <div className="w-full mt-5 flex justify-end">
+      {/* Pagination */}
+      {product && product.total > PAGE_SIZE && (
+        <div className="w-full mt-6 flex justify-end">
           <GlobalPagination
             page={page}
-            total={product.total ?? 0}
+            total={product.total}
             pageSize={PAGE_SIZE}
             onChange={handlePageChange}
           />