diff --git a/public/trivabble.js b/public/trivabble.js
index 93699af..2630de9 100644
--- a/public/trivabble.js
+++ b/public/trivabble.js
@@ -2364,7 +2364,8 @@
         setCellCaptions(getSetting("CELL_CAPTIONS"));
 
         document.getElementById("cell-captions").onchange = function () {
-            setCellCaptions(document.getElementById("cell-captions").value);
+            const mode = document.getElementById("cell-captions").value;
+            setCellCaptions(mode);
             setSetting("CELL_CAPTIONS", mode);
         };
     }
@@ -2618,6 +2619,7 @@
             playerLetters.push(span);
         }
 
+        setCellCaptions(getSetting("CELL_CAPTIONS"));
     }
 
     function initLang() {