diff --git a/i18n/default_de.json b/i18n/default_de.json
index 2087f85..63547ca 100644
--- a/i18n/default_de.json
+++ b/i18n/default_de.json
@@ -76,6 +76,7 @@
   "Allow user theme": "Benutzer-Theme erlauben",
   "Allowed CORS origins": "Erlaubte CORS-Origins",
   "Allowed email domains": "Erlaubte E-Mail-Domains",
+  "Allowed events": "Erlaubte Events",
   "Allowed file types: PNG": "Erlaubte Dateitypen: PNG",
   "Allowed file types: SVG, PNG, JPG, WEBP": "Erlaubte Dateitypen: SVG, PNG, JPG, WEBP",
   "Allowed range: 1-365 days (default: 30)": "Erlaubter Bereich: 1–365 Tage (Standard: 30)",
diff --git a/i18n/default_en.json b/i18n/default_en.json
index 362b65c..87fe25d 100644
--- a/i18n/default_en.json
+++ b/i18n/default_en.json
@@ -76,6 +76,7 @@
   "Allow user theme": "Allow user theme",
   "Allowed CORS origins": "Allowed CORS origins",
   "Allowed email domains": "Allowed email domains",
+  "Allowed events": "Allowed events",
   "Allowed file types: PNG": "Allowed file types: PNG",
   "Allowed file types: SVG, PNG, JPG, WEBP": "Allowed file types: SVG, PNG, JPG, WEBP",
   "Allowed range: 1-365 days (default: 30)": "Allowed range: 1-365 days (default: 30)",
diff --git a/pages/admin/settings/telemetry(default).phtml b/pages/admin/settings/telemetry(default).phtml
index d2062fe..08f0e13 100644
--- a/pages/admin/settings/telemetry(default).phtml
+++ b/pages/admin/settings/telemetry(default).phtml
@@ -60,70 +60,59 @@ $disabledAttr = $isReadOnly ? 'disabled' : '';
     ?>
 
     <form id="settings-telemetry-form" method="post" data-details-storage="settings-telemetry-details-v1" data-standard-detail-form="1">
-      <details class="app-details-card" name="settings-telemetry-core" data-details-key="settings-telemetry-core" open>
+      <details class="app-details-card" name="settings-telemetry" data-details-key="settings-telemetry" open>
         <summary>
           <span class="app-details-card-summary-title"><?php e(t('Frontend telemetry')); ?></span>
           <span class="app-details-card-summary-meta">
             <span class="badge" data-variant="neutral"><?php e($frontendTelemetryEnabled ? t('Enabled') : t('Disabled')); ?></span>
-            <span class="badge" data-variant="neutral"><?php e($frontendTelemetrySampleRate); ?></span>
+            <?php if ($frontendTelemetryEnabled): ?>
+              <span class="badge" data-variant="neutral"><?php e($frontendTelemetrySampleRate); ?></span>
+            <?php endif; ?>
           </span>
         </summary>
         <div class="app-details-card-container">
-          <blockquote data-variant="info">
-            <small><?php e(t('Telemetry helps detect recurring UI issues and failed requests in production.')); ?></small>
-          </blockquote>
-          <fieldset>
-            <legend><small><?php e(t('Frontend telemetry')); ?></small></legend>
-            <label class="app-field">
-              <input
-                type="checkbox"
-                role="switch"
-                name="frontend_telemetry_enabled"
-                value="1"
-                data-telemetry-enabled-toggle
-                <?php e($frontendTelemetryEnabled ? 'checked' : ''); ?>
-                <?php e($disabledAttr); ?>>
-              <span><?php e(t('Enable frontend telemetry')); ?></span>
-            </label>
-          </fieldset>
-          <fieldset data-telemetry-sampling-fieldset <?php e($frontendTelemetryEnabled ? '' : 'hidden'); ?>>
-            <legend><small><?php e(t('Sampling rate')); ?></small></legend>
-            <label class="app-field" data-telemetry-sampling-row>
-              <span><?php e(t('Sampling rate')); ?></span>
-              <select name="frontend_telemetry_sample_rate" data-telemetry-sampling-select <?php e($disabledAttr); ?>>
-                <option value="0.1" <?php e($frontendTelemetrySampleRate === '0.1' ? 'selected' : ''); ?>>10%</option>
-                <option value="0.2" <?php e($frontendTelemetrySampleRate === '0.2' ? 'selected' : ''); ?>>20%</option>
-                <option value="0.5" <?php e($frontendTelemetrySampleRate === '0.5' ? 'selected' : ''); ?>>50%</option>
-                <option value="1" <?php e($frontendTelemetrySampleRate === '1' ? 'selected' : ''); ?>>100%</option>
-              </select>
-              <small><?php e(t('The percentage of users who will have telemetry enabled.')); ?></small>
-            </label>
-          </fieldset>
-        </div>
-      </details>
+          <label class="app-field">
+            <input
+              type="checkbox"
+              role="switch"
+              name="frontend_telemetry_enabled"
+              value="1"
+              data-telemetry-enabled-toggle
+              <?php e($frontendTelemetryEnabled ? 'checked' : ''); ?>
+              <?php e($disabledAttr); ?>>
+            <span><?php e(t('Enable frontend telemetry')); ?></span>
+          </label>
+          <small class="muted"><?php e(t('Telemetry helps detect recurring UI issues and failed requests in production.')); ?></small>
 
-      <details class="app-details-card" name="settings-telemetry-advanced" data-details-key="settings-telemetry-advanced">
-        <summary>
-          <span class="app-details-card-summary-title"><?php e(t('Advanced telemetry options')); ?></span>
-          <span class="app-details-card-summary-meta">
-            <span class="badge" data-variant="neutral"><?php e(sprintf(t('%d events enabled'), count($frontendTelemetryAllowedEvents))); ?></span>
-          </span>
-        </summary>
-        <div class="app-details-card-container">
-          <blockquote data-variant="info">
-            <small><?php e(t('Limit which event types are collected to match your privacy and operations requirements.')); ?></small>
-          </blockquote>
-          <fieldset>
-            <legend><small><?php e(t('Allowed telemetry events')); ?></small></legend>
-            <label class="app-field">
-              <input type="checkbox" name="frontend_telemetry_allowed_events[]" value="warn_once" <?php e(in_array('warn_once', $frontendTelemetryAllowedEvents, true) ? 'checked' : ''); ?> <?php e($disabledAttr); ?>>
-              <span><?php e(t('warnOnce warnings')); ?></span>
-            </label>
-            <label class="app-field">
-              <input type="checkbox" name="frontend_telemetry_allowed_events[]" value="ajax_error" <?php e(in_array('ajax_error', $frontendTelemetryAllowedEvents, true) ? 'checked' : ''); ?> <?php e($disabledAttr); ?>>
-              <span><?php e(t('AJAX errors')); ?></span>
-            </label>
-          </fieldset>
+          <div data-telemetry-when-enabled <?php e($frontendTelemetryEnabled ? '' : 'hidden'); ?>>
+            <hr>
+            <div class="grid">
+              <label class="app-field">
+                <span><?php e(t('Sampling rate')); ?></span>
+                <select name="frontend_telemetry_sample_rate" <?php e($disabledAttr); ?>>
+                  <option value="0.1" <?php e($frontendTelemetrySampleRate === '0.1' ? 'selected' : ''); ?>>10%</option>
+                  <option value="0.2" <?php e($frontendTelemetrySampleRate === '0.2' ? 'selected' : ''); ?>>20%</option>
+                  <option value="0.5" <?php e($frontendTelemetrySampleRate === '0.5' ? 'selected' : ''); ?>>50%</option>
+                  <option value="1" <?php e($frontendTelemetrySampleRate === '1' ? 'selected' : ''); ?>>100%</option>
+                </select>
+                <small><?php e(t('The percentage of users who will have telemetry enabled.')); ?></small>
+              </label>
+              <div></div>
+            </div>
+
+            <fieldset>
+              <legend><small><?php e(t('Allowed events')); ?></small></legend>
+              <label class="app-field">
+                <input type="checkbox" name="frontend_telemetry_allowed_events[]" value="warn_once" <?php e(in_array('warn_once', $frontendTelemetryAllowedEvents, true) ? 'checked' : ''); ?> <?php e($disabledAttr); ?>>
+                <span><?php e(t('warnOnce warnings')); ?></span>
+              </label>
+              <label class="app-field">
+                <input type="checkbox" name="frontend_telemetry_allowed_events[]" value="ajax_error" <?php e(in_array('ajax_error', $frontendTelemetryAllowedEvents, true) ? 'checked' : ''); ?> <?php e($disabledAttr); ?>>
+                <span><?php e(t('AJAX errors')); ?></span>
+              </label>
+            </fieldset>
+            <small class="muted"><?php e(t('Limit which event types are collected to match your privacy and operations requirements.')); ?></small>
+          </div>
         </div>
       </details>
 
diff --git a/web/js/components/app-settings-telemetry.js b/web/js/components/app-settings-telemetry.js
index 3186f1a..218a9d7 100644
--- a/web/js/components/app-settings-telemetry.js
+++ b/web/js/components/app-settings-telemetry.js
@@ -1,5 +1,7 @@
 /**
- * Tracks settings page interactions for telemetry.
+ * Hides the telemetry sub-config (sampling + allowed events) when the
+ * master toggle is off. The sub-block is one container so all dependent
+ * fields stay in sync together.
  */
 import { resolveHost } from '../core/app-dom.js';
 import { syncControlState } from '../core/app-conditional-controls.js';
@@ -7,30 +9,21 @@ import { syncControlState } from '../core/app-conditional-controls.js';
 export const initTelemetrySettings = (root = document, options = {}) => {
   const host = resolveHost(root);
   const toggleSelector = String(options.toggleSelector || '[data-telemetry-enabled-toggle]').trim() || '[data-telemetry-enabled-toggle]';
-  const samplingFieldsetSelector = String(options.samplingFieldsetSelector || '[data-telemetry-sampling-fieldset]').trim() || '[data-telemetry-sampling-fieldset]';
-  const samplingRowSelector = String(options.samplingRowSelector || '[data-telemetry-sampling-row]').trim() || '[data-telemetry-sampling-row]';
+  const dependentSelector = String(options.dependentSelector || '[data-telemetry-when-enabled]').trim() || '[data-telemetry-when-enabled]';
 
   const toggle = host.querySelector(toggleSelector);
-  const samplingFieldset = host.querySelector(samplingFieldsetSelector);
-  const samplingRow = host.querySelector(samplingRowSelector);
+  const dependent = host.querySelector(dependentSelector);
 
-  if (!toggle || !samplingFieldset) {
+  if (!toggle || !dependent) {
     return { destroy: () => {} };
   }
 
-  const syncSamplingVisibility = () => {
-    const active = Boolean(toggle.checked);
-    syncControlState(samplingFieldset, active);
-    if (samplingRow instanceof HTMLElement) {
-      samplingRow.hidden = !active;
-    }
-  };
-
-  toggle.addEventListener('change', syncSamplingVisibility);
-  syncSamplingVisibility();
+  const sync = () => syncControlState(dependent, Boolean(toggle.checked));
+  toggle.addEventListener('change', sync);
+  sync();
   return {
     destroy: () => {
-      toggle.removeEventListener('change', syncSamplingVisibility);
+      toggle.removeEventListener('change', sync);
     },
   };
 };