diff --git a/server/routes/rooms.js b/server/routes/rooms.js
index 63db1bd..a812783 100644
--- a/server/routes/rooms.js
+++ b/server/routes/rooms.js
@@ -272,7 +272,7 @@ router.get('/:uid/public', async (req, res) => {
   try {
     const db = getDb();
     const room = await db.get(`
-      SELECT r.uid, r.name, r.guest_access, r.welcome_message, r.access_code,
+      SELECT r.uid, r.name, r.welcome_message, r.access_code,
         u.name as owner_name
       FROM rooms r
       JOIN users u ON r.user_id = u.id
@@ -283,10 +283,6 @@ router.get('/:uid/public', async (req, res) => {
       return res.status(404).json({ error: 'Raum nicht gefunden' });
     }
 
-    if (!room.guest_access) {
-      return res.status(403).json({ error: 'Gastzugang ist für diesen Raum nicht aktiviert' });
-    }
-
     const running = await isMeetingRunning(room.uid);
 
     res.json({
@@ -321,10 +317,6 @@ router.post('/:uid/guest-join', async (req, res) => {
       return res.status(404).json({ error: 'Raum nicht gefunden' });
     }
 
-    if (!room.guest_access) {
-      return res.status(403).json({ error: 'Gastzugang ist für diesen Raum nicht aktiviert' });
-    }
-
     // Check access code if set
     if (room.access_code && access_code !== room.access_code) {
       return res.status(403).json({ error: 'Falscher Zugangscode' });
diff --git a/src/pages/RoomDetail.jsx b/src/pages/RoomDetail.jsx
index e493647..de7c523 100644
--- a/src/pages/RoomDetail.jsx
+++ b/src/pages/RoomDetail.jsx
@@ -416,52 +416,36 @@ export default function RoomDetail() {
           {/* Guest access section */}
           <div className="pt-4 border-t border-th-border space-y-4">
             <h3 className="text-sm font-semibold text-th-text">{t('room.guestAccessTitle')}</h3>
-            <label className="flex items-center gap-3 cursor-pointer">
-              <input
-                type="checkbox"
-                checked={!!editRoom.guest_access}
-                onChange={e => setEditRoom({ ...editRoom, guest_access: e.target.checked })}
-                className="w-4 h-4 rounded border-th-border text-th-accent focus:ring-th-ring"
-              />
-              <div>
-                <span className="text-sm text-th-text">{t('room.guestAccess')}</span>
-                <p className="text-xs text-th-text-s">{t('room.guestAccessHint')}</p>
-              </div>
-            </label>
 
-            {editRoom.guest_access && (
-              <>
-                <div>
-                  <label className="block text-sm font-medium text-th-text mb-1.5">{t('room.moderatorCode')}</label>
-                  <input
-                    type="text"
-                    value={editRoom.moderator_code || ''}
-                    onChange={e => setEditRoom({ ...editRoom, moderator_code: e.target.value })}
-                    className="input-field"
-                    placeholder={t('room.moderatorCodeHint')}
-                  />
-                  <p className="text-xs text-th-text-s mt-1">{t('room.moderatorCodeDesc')}</p>
-                </div>
-                <div>
-                  <label className="block text-sm font-medium text-th-text mb-1.5">{t('room.guestLink')}</label>
-                  <div className="flex items-center gap-2">
-                    <code className="flex-1 bg-th-bg-s px-3 py-2 rounded-lg text-xs text-th-text font-mono truncate border border-th-border">
-                      {window.location.origin}/join/{room.uid}
-                    </code>
-                    <button
-                      type="button"
-                      onClick={() => {
-                        navigator.clipboard.writeText(`${window.location.origin}/join/${room.uid}`);
-                        toast.success(t('room.linkCopied'));
-                      }}
-                      className="btn-ghost text-xs py-2 px-3"
-                    >
-                      <Copy size={14} />
-                    </button>
-                  </div>
-                </div>
-              </>
-            )}
+            <div>
+              <label className="block text-sm font-medium text-th-text mb-1.5">{t('room.moderatorCode')}</label>
+              <input
+                type="text"
+                value={editRoom.moderator_code || ''}
+                onChange={e => setEditRoom({ ...editRoom, moderator_code: e.target.value })}
+                className="input-field"
+                placeholder={t('room.moderatorCodeHint')}
+              />
+              <p className="text-xs text-th-text-s mt-1">{t('room.moderatorCodeDesc')}</p>
+            </div>
+            <div>
+              <label className="block text-sm font-medium text-th-text mb-1.5">{t('room.guestLink')}</label>
+              <div className="flex items-center gap-2">
+                <code className="flex-1 bg-th-bg-s px-3 py-2 rounded-lg text-xs text-th-text font-mono truncate border border-th-border">
+                  {window.location.origin}/join/{room.uid}
+                </code>
+                <button
+                  type="button"
+                  onClick={() => {
+                    navigator.clipboard.writeText(`${window.location.origin}/join/${room.uid}`);
+                    toast.success(t('room.linkCopied'));
+                  }}
+                  className="btn-ghost text-xs py-2 px-3"
+                >
+                  <Copy size={14} />
+                </button>
+              </div>
+            </div>
           </div>
 
           <div className="pt-4 border-t border-th-border">