diff --git a/src/app/[locale]/admin/clubs/[club_id]/slot-definitions/MaterialisationStatusPanel.tsx b/src/app/[locale]/admin/clubs/[club_id]/slot-definitions/MaterialisationStatusPanel.tsx
index d2a6b96..df004bb 100644
--- a/src/app/[locale]/admin/clubs/[club_id]/slot-definitions/MaterialisationStatusPanel.tsx
+++ b/src/app/[locale]/admin/clubs/[club_id]/slot-definitions/MaterialisationStatusPanel.tsx
@@ -148,7 +148,7 @@ export default function MaterialisationStatusPanel({ clubId }: MaterialisationSt
         </div>
 
         {/* Status badge */}
-        {status.status === 'completed' && !isRateLimited && (
+        {(status.status === 'completed' || (status.status === 'idle' && status.last_success_at)) && !isRateLimited && (
           <div className="flex items-center space-x-2 text-green-600">
             <CheckCircle className="w-5 h-5" />
             <span className="font-semibold">Up to date</span>
@@ -176,7 +176,7 @@ export default function MaterialisationStatusPanel({ clubId }: MaterialisationSt
           </div>
         )}
 
-        {status.status === 'idle' && (
+        {status.status === 'idle' && !status.last_run_at && (
           <div className="flex items-center space-x-2 text-slate-500">
             <AlertTriangle className="w-5 h-5" />
             <span className="font-semibold">Not yet run</span>
@@ -194,11 +194,11 @@ export default function MaterialisationStatusPanel({ clubId }: MaterialisationSt
       )}
 
       {/* Success state */}
-      {status.status === 'completed' && status.last_success_at && !isRateLimited && (
+      {(status.status === 'completed' || (status.status === 'idle' && status.last_success_at)) && !isRateLimited && (
         <div className="space-y-2">
           <div className="text-sm text-slate-700">
             <span className="font-semibold">Last generated:</span>{' '}
-            {formatTimestamp(status.last_success_at)}
+            {formatTimestamp(status.last_success_at!)}
           </div>
           {status.slots_generated !== null && (
             <div className="text-sm text-slate-700">