diff --git a/web/quiz.js b/web/quiz.js
index 9912b11..6651866 100644
--- a/web/quiz.js
+++ b/web/quiz.js
@@ -157,8 +157,12 @@ function updateSubmitTimer() {
 		clearInterval(state.submitInterval)
 
 		if (getRule('questionTimeout') && !getRule('allowQOvertime')) {
-			console.log("Question not submitted, clearing input");
-			resetQuestionResponse(state.currentQuestion);
+
+			if (!state.waitNextQuestion) {
+				console.log("Question not submitted, clearing input");
+				resetQuestionResponse(state.currentQuestion);
+			}
+
 			submitQuiz() // Force next question
 		}