diff --git a/src/js/config.js b/src/js/config.js
index d7c255d8a..c786b6635 100644
--- a/src/js/config.js
+++ b/src/js/config.js
@@ -22,6 +22,7 @@ import * as ChallengeContoller from "./challenge-controller";
 import * as TTS from "./tts";
 import * as MobileTestConfig from "./mobile-test-config.js";
 import * as TestConfig from "./test-config.js";
+import * as PractiseWords from "./practise-words";
 
 export let localStorageConfig = null;
 export let dbConfigLoaded = false;
@@ -252,6 +253,7 @@ export function setMode(mode, nosave) {
   TestConfig.update(previous, config.mode);
   MobileTestConfig.update();
   ChallengeContoller.clearActive();
+  PractiseWords.resetBefore();
   if (!nosave) saveToLocalStorage();
 }
 
diff --git a/src/js/test/test-logic.js b/src/js/test/test-logic.js
index 75182f4dc..2196c5220 100644
--- a/src/js/test/test-logic.js
+++ b/src/js/test/test-logic.js
@@ -527,9 +527,9 @@ export function restart(
     !practiseMissed
   ) {
     Notifications.add("Reverting to previous settings.", 0);
-    UpdateConfig.setMode(PractiseWords.before.mode);
     UpdateConfig.setPunctuation(PractiseWords.before.punctuation);
     UpdateConfig.setNumbers(PractiseWords.before.numbers);
+    UpdateConfig.setMode(PractiseWords.before.mode);
     PractiseWords.resetBefore();
   }