diff --git a/app/(landing)/hackathons/[slug]/page.tsx b/app/(landing)/hackathons/[slug]/page.tsx
index 43e983bb..1350ea7a 100644
--- a/app/(landing)/hackathons/[slug]/page.tsx
+++ b/app/(landing)/hackathons/[slug]/page.tsx
@@ -342,11 +342,9 @@ export default function HackathonPage() {
             )}
 
             {activeTab === 'resources' &&
-              currentHackathon.resources?.length > 0 && ( // Direct array check
-                <HackathonResources />
-              )}
+              currentHackathon.resources?.length > 0 && <HackathonResources />}
             {activeTab === 'participants' &&
-              currentHackathon.participants?.length > 0 && ( // Direct array check
+              currentHackathon.participants?.length > 0 && (
                 <HackathonParticipants />
               )}
 
diff --git a/app/(landing)/organizations/[id]/hackathons/page.tsx b/app/(landing)/organizations/[id]/hackathons/page.tsx
index 8a324e41..1f0fb3e0 100644
--- a/app/(landing)/organizations/[id]/hackathons/page.tsx
+++ b/app/(landing)/organizations/[id]/hackathons/page.tsx
@@ -157,7 +157,7 @@ export default function HackathonsPage() {
             ? (item.data as HackathonDraft).data.information?.categories
                 ?.join(',')
                 ?.toLowerCase() || ''
-            : ''; // Categories filtering only applies to drafts for now
+            : '';
         return category.includes(categoryFilter.toLowerCase());
       });
     }
@@ -494,9 +494,11 @@ export default function HackathonsPage() {
                   );
                 }
 
+                const publishedHackathon = hackathon as Hackathon;
+
                 return (
                   <div
-                    key={`hackathon-${hackathon.id}`}
+                    key={`hackathon-${publishedHackathon.id}`}
                     className='group rounded-xl border border-zinc-800 bg-zinc-900/30 transition-all hover:border-zinc-700 hover:bg-zinc-900/50'
                   >
                     <div className='p-6'>
@@ -506,15 +508,15 @@ export default function HackathonsPage() {
                             <Badge
                               variant='outline'
                               className={`rounded-full border-none px-3 py-1 text-xs font-medium ${
-                                hackathon.status === 'PUBLISHED' ||
-                                hackathon.status === 'ONGOING'
+                                publishedHackathon.status === 'PUBLISHED' ||
+                                publishedHackathon.status === 'ONGOING'
                                   ? 'bg-green-500/10 text-green-500'
                                   : 'bg-secondary-500/10 text-secondary-500'
                               }`}
                             >
-                              {hackathon.status === 'PUBLISHED'
+                              {publishedHackathon.status === 'PUBLISHED'
                                 ? 'Live'
-                                : hackathon.status}
+                                : publishedHackathon.status}
                             </Badge>
                             {endDate && (
                               <div className='flex items-center gap-1.5 text-sm text-zinc-500'>
@@ -531,11 +533,19 @@ export default function HackathonsPage() {
                           <div className='flex items-center gap-6 text-sm text-zinc-500'>
                             <div className='flex items-center gap-2'>
                               <Users className='h-4 w-4' />
-                              <span>0 participants</span>
+                              <span>
+                                {publishedHackathon.participants?.length ||
+                                  publishedHackathon._count?.participants ||
+                                  0}{' '}
+                                participants
+                              </span>
                             </div>
                             <div className='flex items-center gap-2'>
                               <FileText className='h-4 w-4' />
-                              <span>0 submissions</span>
+                              <span>
+                                {publishedHackathon._count?.submissions || 0}{' '}
+                                submissions
+                              </span>
                             </div>
                             {totalPrize > 0 && (
                               <>
@@ -560,7 +570,7 @@ export default function HackathonsPage() {
                           <button
                             onClick={() =>
                               router.push(
-                                `/organizations/${organizationId}/hackathons/${hackathon.id}`
+                                `/organizations/${organizationId}/hackathons/${publishedHackathon.id}`
                               )
                             }
                             className='flex h-9 w-9 items-center justify-center rounded-lg border border-zinc-800 bg-zinc-900/50 text-zinc-400 transition-all hover:border-zinc-700 hover:text-white'
@@ -571,7 +581,7 @@ export default function HackathonsPage() {
                           <button
                             onClick={() =>
                               router.push(
-                                `/organizations/${organizationId}/hackathons/${hackathon.id}/settings`
+                                `/organizations/${organizationId}/hackathons/${publishedHackathon.id}/settings`
                               )
                             }
                             className='flex h-9 w-9 items-center justify-center rounded-lg border border-zinc-800 bg-zinc-900/50 text-zinc-400 transition-all hover:border-zinc-700 hover:text-white'
@@ -580,7 +590,9 @@ export default function HackathonsPage() {
                             <Settings className='h-4 w-4' />
                           </button>
                           <button
-                            onClick={() => handleDeleteClick(hackathon.id)}
+                            onClick={() =>
+                              handleDeleteClick(publishedHackathon.id)
+                            }
                             className='flex h-9 w-9 items-center justify-center rounded-lg border border-zinc-800 bg-zinc-900/50 text-zinc-400 transition-all hover:border-red-600 hover:text-red-500'
                             title='Delete Hackathon'
                             disabled={isDeleting}
diff --git a/components/hackathons/HackathonsPage.tsx b/components/hackathons/HackathonsPage.tsx
index 9643f954..9259882f 100644
--- a/components/hackathons/HackathonsPage.tsx
+++ b/components/hackathons/HackathonsPage.tsx
@@ -10,6 +10,7 @@ import { useHackathonTransform } from '@/hooks/hackathon/use-hackathon-transform
 import { BoundlessButton } from '../buttons';
 import { ArrowDownIcon, XIcon } from 'lucide-react';
 import LoadingScreen from '@/features/projects/components/CreateProjectModal/LoadingScreen';
+import EmptyState from '@/components/EmptyState';
 
 interface HackathonsPageProps {
   className?: string;
@@ -123,8 +124,8 @@ export default function HackathonsPage({
         {!loading && !error && hackathons.length === 0 && (
           <div className='flex flex-col items-center justify-center py-16'>
             <div className='text-center'>
-              {/* <EmptyState
-                title='No hackathons found'
+              <EmptyState
+                title='No available hackathons'
                 description={
                   filters.search ||
                   filters.category ||
@@ -134,7 +135,7 @@ export default function HackathonsPage({
                     : 'No hackathons are available at the moment'
                 }
                 type='compact'
-              /> */}
+              />
 
               {(filters.search ||
                 filters.category ||
@@ -144,7 +145,7 @@ export default function HackathonsPage({
                   <BoundlessButton
                     onClick={clearAllFilters}
                     variant='outline'
-                    className='bg-primary hover:bg-primary/80 rounded-lg px-6 py-3 text-white transition-colors'
+                    className='bg-primary/10 border-primary text-primary hover:bg-primary/20 rounded-lg px-6 py-3 transition-colors'
                   >
                     Clear all filters
                   </BoundlessButton>