diff --git a/backend/src/routes/events.js b/backend/src/routes/events.js
index 9ad4dfe..d315896 100644
--- a/backend/src/routes/events.js
+++ b/backend/src/routes/events.js
@@ -19,7 +19,6 @@ router.get('/', authenticate, async (req, res, next) => {
         startDate: true,
         endDate: true,
         worldsdcId: true,
-        participantsCount: true,
         description: true,
         createdAt: true,
         participants: {
@@ -30,6 +29,11 @@ router.get('/', authenticate, async (req, res, next) => {
             joinedAt: true,
           },
         },
+        _count: {
+          select: {
+            participants: true,
+          },
+        },
       },
     });
 
@@ -42,7 +46,7 @@ router.get('/', authenticate, async (req, res, next) => {
       startDate: event.startDate,
       endDate: event.endDate,
       worldsdcId: event.worldsdcId,
-      participantsCount: event.participantsCount,
+      participantsCount: event._count.participants,
       description: event.description,
       createdAt: event.createdAt,
       isJoined: event.participants.length > 0,
diff --git a/frontend/src/pages/EventsPage.jsx b/frontend/src/pages/EventsPage.jsx
index 3b10d11..6d94a04 100644
--- a/frontend/src/pages/EventsPage.jsx
+++ b/frontend/src/pages/EventsPage.jsx
@@ -2,7 +2,7 @@ import { useState, useEffect } from 'react';
 import { useNavigate } from 'react-router-dom';
 import Layout from '../components/layout/Layout';
 import { eventsAPI } from '../services/api';
-import { Calendar, MapPin, Users, Loader2, CheckCircle } from 'lucide-react';
+import { Calendar, MapPin, Users, Loader2, CheckCircle, QrCode } from 'lucide-react';
 
 const EventsPage = () => {
   const navigate = useNavigate();
@@ -101,12 +101,36 @@ const EventsPage = () => {
                 <p className="text-gray-600 text-sm mb-4">{event.description}</p>
               )}
 
-              <button
-                onClick={() => handleJoinEvent(event.slug)}
-                className="w-full px-4 py-2 bg-primary-600 text-white rounded-md hover:bg-primary-700 transition-colors"
-              >
-                {event.isJoined ? 'Open chat' : 'Join chat'}
-              </button>
+              <div className="space-y-2">
+                {event.isJoined ? (
+                  <button
+                    onClick={() => handleJoinEvent(event.slug)}
+                    className="w-full px-4 py-2 bg-primary-600 text-white rounded-md hover:bg-primary-700 transition-colors"
+                  >
+                    Open chat
+                  </button>
+                ) : (
+                  <div className="bg-amber-50 border border-amber-200 rounded-md p-4 text-sm text-amber-800">
+                    <div className="flex items-center gap-2 font-medium mb-2">
+                      <QrCode className="w-5 h-5" />
+                      Check-in required
+                    </div>
+                    <p className="text-amber-700">
+                      Scan the QR code at the event venue to join the chat
+                    </p>
+                  </div>
+                )}
+
+                {/* Development mode: Show details link */}
+                {import.meta.env.DEV && (
+                  <button
+                    onClick={() => navigate(`/events/${event.slug}/details`)}
+                    className="w-full px-4 py-2 border border-gray-300 text-gray-700 rounded-md hover:bg-gray-50 transition-colors text-sm"
+                  >
+                    View details (dev)
+                  </button>
+                )}
+              </div>
             </div>
           ))}
         </div>