diff --git a/docker/routlin-dash/app/view_page.py b/docker/routlin-dash/app/view_page.py
index d17367a..2d8cd62 100644
--- a/docker/routlin-dash/app/view_page.py
+++ b/docker/routlin-dash/app/view_page.py
@@ -1653,11 +1653,11 @@ def _render_table_cell(value, render_fn, col_class='', field='', row_idx=None,
     if render_fn == 'badge_yes_no':
         opts = render_options or {}
         if str(value).lower() in ('true', '1', 'yes', 'enabled'):
-            title = f' title="{e(opts["title_true"])}"' if opts.get('title_true') else ''
-            inner = f'<span class="badge badge-enabled"{title}>Yes</span>'
+            tip = f' data-tooltip="{e(opts["title_true"])}"' if opts.get('title_true') else ''
+            inner = f'<span class="badge badge-enabled"{tip}>Yes</span>'
         else:
-            title = f' title="{e(opts["title_false"])}"' if opts.get('title_false') else ''
-            inner = f'<span class="badge badge-disabled"{title}>No</span>'
+            tip = f' data-tooltip="{e(opts["title_false"])}"' if opts.get('title_false') else ''
+            inner = f'<span class="badge badge-disabled"{tip}>No</span>'
         return f'{td_open}{inner}</td>'
 
     if render_fn == 'badge_recording_on_off':